aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss/Layer.scss
diff options
context:
space:
mode:
authorhwc4872012-02-27 13:41:31 -0800
committerhwc4872012-02-27 13:41:31 -0800
commit124ad4709780013615d2ff1da05ace9887ee7709 (patch)
treee8de66216e338f4cba1a98c3a00473ead3daef9d /js/panels/Timeline/Layer.reel/scss/Layer.scss
parenta8bd1585ae83d4d304b9f9f41823bb3dcbff9e01 (diff)
parent8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
downloadninja-124ad4709780013615d2ff1da05ace9887ee7709.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss/Layer.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 */