diff options
author | Pushkar Joshi | 2012-02-24 12:03:51 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:03:51 -0800 |
commit | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (patch) | |
tree | 8cfd5c51f72624ff1da50f3a2fbed05644ffd8e2 /js/panels/Timeline/Style.reel/Style.js | |
parent | a5ba66ecefa9c9c17e0f5e1725e2141f7a3540a2 (diff) | |
parent | 23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff) | |
download | ninja-053fc63a2950c7a5ee4ebf98033b64d474a3c46e.tar.gz |
Merge branch 'master' into pentool
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: |