diff options
| author | Valerio Virgillito | 2012-02-24 10:39:39 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-24 10:39:39 -0800 |
| commit | 60845326f5313b7e34f0ad8d9815bc6605ed4c18 (patch) | |
| tree | 2357eb8c914f57b7da71982d454ca2b4b9a2dee3 /js/panels/Timeline/Style.reel/scss/Style.scss | |
| parent | afc53c6f553c97ab778154154aa2b7a146cb5fef (diff) | |
| parent | 23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff) | |
| download | ninja-60845326f5313b7e34f0ad8d9815bc6605ed4c18.tar.gz | |
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss/Style.scss')
| -rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 1 | /* Layer.scss | 7 | /* Layer.scss |
| 2 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 8 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
| 3 | */ | 9 | */ |