aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:03:51 -0800
committerPushkar Joshi2012-02-24 12:03:51 -0800
commit053fc63a2950c7a5ee4ebf98033b64d474a3c46e (patch)
tree8cfd5c51f72624ff1da50f3a2fbed05644ffd8e2 /js/panels/Timeline/Layer.reel/scss
parenta5ba66ecefa9c9c17e0f5e1725e2141f7a3540a2 (diff)
parent23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
downloadninja-053fc63a2950c7a5ee4ebf98033b64d474a3c46e.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index c66a6267..dda0c951 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,5 +1,11 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7 </copyright> */
8
3/* Layer.scss 9/* Layer.scss
4 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 10 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
5 */ 11 */