diff options
| author | Ananya Sen | 2012-02-27 14:24:49 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-27 14:24:49 -0800 |
| commit | 15d00c49b522aa471d1ccfbbd33f5c0e721eb89e (patch) | |
| tree | 5c352c198ed7404f3fe0a9c5915e1727d3003f9f /js/panels/Timeline/Style.reel/Style.js | |
| parent | 604ace9cfc9fae6b6c121259523a9060c5306161 (diff) | |
| parent | 7e63b5d0b6990b6c0ec0385d35534b91982ac672 (diff) | |
| download | ninja-15d00c49b522aa471d1ccfbbd33f5c0e721eb89e.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.js')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index e6e03901..027f3a40 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
| @@ -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 | /* | 7 | /* |
| 2 | * Style component: Edits and manages a single style rule for a Layer in the Timeline. | 8 | * Style component: Edits and manages a single style rule for a Layer in the Timeline. |
| 3 | * Public Properties: | 9 | * Public Properties: |