aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 15:15:12 -0800
committerJose Antonio Marquez2012-02-28 15:15:12 -0800
commitda83f44b0ecf379b0950a88d1c378fbedb80e386 (patch)
treec294662148907b6d496afee3dea1c03f18491680 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
parentb799b7cf3a422f407045c52a4c6a61756d1ea096 (diff)
parent676b4e2d7091ac63ce06f51be686b902b940bfff (diff)
downloadninja-da83f44b0ecf379b0950a88d1c378fbedb80e386.tar.gz
Merge branch 'refs/heads/integration-candidate' into FileIO-Build-Candidate
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 158d666e..26d045d6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -62,6 +62,11 @@
62 "boundObject" : {"@": "tweenRepetition"}, 62 "boundObject" : {"@": "tweenRepetition"},
63 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated", 63 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
64 "oneway" : false 64 "oneway" : false
65 },
66 "isClearing" : {
67 "boundObject" : {"@": "tweenRepetition"},
68 "boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing",
69 "oneway" : false
65 } 70 }
66 } 71 }
67 }, 72 },