From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Mon, 6 Feb 2012 13:30:49 -0800
Subject: merge new timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Tween.reel/css/Tween.css | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 js/panels/Timeline/Tween.reel/css/Tween.css

(limited to 'js/panels/Timeline/Tween.reel/css')

diff --git a/js/panels/Timeline/Tween.reel/css/Tween.css b/js/panels/Timeline/Tween.reel/css/Tween.css
new file mode 100644
index 00000000..942f9fc9
--- /dev/null
+++ b/js/panels/Timeline/Tween.reel/css/Tween.css
@@ -0,0 +1,4 @@
+.tween_container{
+    height: 16px;
+    position: absolute;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 10:20:04 -0800
Subject: Adding some missing copyrights

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Tween.reel/css/Tween.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/panels/Timeline/Tween.reel/css')

diff --git a/js/panels/Timeline/Tween.reel/css/Tween.css b/js/panels/Timeline/Tween.reel/css/Tween.css
index 942f9fc9..81e00073 100644
--- a/js/panels/Timeline/Tween.reel/css/Tween.css
+++ b/js/panels/Timeline/Tween.reel/css/Tween.css
@@ -1,3 +1,9 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 .tween_container{
     height: 16px;
     position: absolute;
-- 
cgit v1.2.3