aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 11:13:30 -0700
committerValerio Virgillito2012-06-12 11:13:30 -0700
commit962d8d11c68761a1c3c89289dc0f6d9de07da755 (patch)
tree3efaf5ba86e842b0610b04c2ce778fc3a4db2576 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
parenta61713e5187e10cebf7984ced7a8443949c412b0 (diff)
parent55e392b4ac5e45e8bf468399b3c0ddde669a15fd (diff)
downloadninja-962d8d11c68761a1c3c89289dc0f6d9de07da755.tar.gz
Merge pull request #296 from imix23ways/jd-pullreq
fix montage serialization in timeline for v10
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 5c5a8b76..091470f3 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -16,10 +16,10 @@
16 "element": {"#": "track"}, 16 "element": {"#": "track"},
17 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
18 "tween": {"@" : "tween"}, 18 "tween": {"@" : "tween"},
19 "_mainCollapser" : {"@" : "mainCollapser"}, 19 "mainCollapser" : {"@" : "mainCollapser"},
20 "_positionCollapser" : {"@" : "positionCollapser"}, 20 "positionCollapser" : {"@" : "positionCollapser"},
21 "_transformCollapser" : {"@" : "transformCollapser"}, 21 "transformCollapser" : {"@" : "transformCollapser"},
22 "_styleCollapser" : {"@" : "styleCollapser"} 22 "styleCollapser" : {"@" : "styleCollapser"}
23 } 23 }
24 }, 24 },
25 25