From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:37:17 -0800
Subject: Timeline Reset to clean Master branch.  Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Style.reel/scss/Style.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index f15f553d..827a0c43 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -3,11 +3,11 @@
  */
  
 // Import theme settings
-@import "../../../../../_scss/imports/themes/default/colors";
-@import "../../../../../_scss/imports/themes/default/mixins";
+@import "../../../../../scss/imports/themes/default/colors";
+@import "../../../../../scss/imports/themes/default/mixins";
 
 // Import generic mixins and styles
-@import "../../../../../_scss/imports/scss/mixins";
+@import "../../../../../scss/imports/scss/mixins";
 
 .hidden {
 	display: none;
-- 
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/Style.reel/scss/Style.scss | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 827a0c43..30bf43fe 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -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> */
+
 /* Layer.scss
  * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
  */
-- 
cgit v1.2.3