aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorJon Reid2012-02-08 10:29:00 -0800
committerJon Reid2012-02-08 10:29:00 -0800
commit687ef6c8c8aad9728f106b1802cf0bfc5ce745f0 (patch)
treedb790c730001b9339f2a7083b522d33587de8efc /js/panels/Timeline/Tween.reel
parent6ce7a6c94b2ea24a3a3a2aba7230864e924e952b (diff)
parent91df2e8030db394060667202a97138db3f871fa5 (diff)
downloadninja-687ef6c8c8aad9728f106b1802cf0bfc5ce745f0.tar.gz
Merge branch 'Timeline-jduran' into Timeline-jreid
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index 3e72acc0..307dcd02 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -28,7 +28,8 @@
28 "module": "js/panels/Timeline/Keyframe.reel", 28 "module": "js/panels/Timeline/Keyframe.reel",
29 "name": "Keyframe", 29 "name": "Keyframe",
30 "properties": { 30 "properties": {
31 "element": {"#": "keyframe_container"} 31 "element": {"#": "keyframe_container"},
32 "containingSpan": {"@": "span"}
32 } 33 }
33 } 34 }
34 } 35 }