aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.html
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/panels/Timeline/Tween.reel/Tween.html
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html11
1 files changed, 4 insertions, 7 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index ce51cb70..c161b3f8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Tween.reel", 14 "prototype": "js/panels/Timeline/Tween.reel",
15 "name": "Tween",
16 "properties": { 15 "properties": {
17 "element": {"#": "tweenspace"}, 16 "element": {"#": "tweenspace"},
18 "keyframe": {"@": "keyframe"}, 17 "keyframe": {"@": "keyframe"},
@@ -21,16 +20,14 @@
21 }, 20 },
22 21
23 "span": { 22 "span": {
24 "module": "js/panels/Timeline/Span.reel", 23 "prototype": "js/panels/Timeline/Span.reel",
25 "name": "Span",
26 "properties": { 24 "properties": {
27 "element": {"#": "span_container"} 25 "element": {"#": "span_container"}
28 } 26 }
29 }, 27 },
30 28
31 "keyframe": { 29 "keyframe": {
32 "module": "js/panels/Timeline/Keyframe.reel", 30 "prototype": "js/panels/Timeline/Keyframe.reel",
33 "name": "Keyframe",
34 "properties": { 31 "properties": {
35 "element": {"#": "keyframe_container"} 32 "element": {"#": "keyframe_container"}
36 } 33 }