diff options
author | Jon Reid | 2012-02-24 13:04:35 -0800 |
---|---|---|
committer | Jon Reid | 2012-02-24 13:04:35 -0800 |
commit | ae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch) | |
tree | 5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/panels/Timeline/Layer.reel/css | |
parent | c615e1d305424f16f64aca16cf38da760a5eec87 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into Timeline-local
Diffstat (limited to 'js/panels/Timeline/Layer.reel/css')
-rw-r--r-- | js/panels/Timeline/Layer.reel/css/Layer.css | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css index 3d7ba963..18d0a5e3 100644 --- a/js/panels/Timeline/Layer.reel/css/Layer.css +++ b/js/panels/Timeline/Layer.reel/css/Layer.css | |||
@@ -1,4 +1,10 @@ | |||
1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
2 | /* <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> */ | ||
7 | |||
2 | /* Layer.scss | 8 | /* Layer.scss |
3 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 9 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
4 | */ | 10 | */ |