aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-19 18:21:45 -0700
committerValerio Virgillito2012-07-19 18:21:45 -0700
commit6d38a574e4f6ed7dbb0a5d033fc2f3766dd5fc98 (patch)
treec0d1688ec3d8426295bd315cece84f2f611872a1 /js/ninja.reel/ninja.html
parent4b1a4b6b424400080271202800d2de78e5509708 (diff)
parent6403ec6d21048c93138ddcbcc59fc4677121ed5e (diff)
downloadninja-6d38a574e4f6ed7dbb0a5d033fc2f3766dd5fc98.tar.gz
Merge branch 'timeline-play' of https://github.com/mencio/ninja into v0.7.1
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 4f40a3f8..fbbfd066 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -268,7 +268,8 @@ POSSIBILITY OF SUCH DAMAGE.
268 "timeline": { 268 "timeline": {
269 "prototype": "js/panels/Timeline/TimelinePanel.reel", 269 "prototype": "js/panels/Timeline/TimelinePanel.reel",
270 "properties": { 270 "properties": {
271 "element": {"#": "timelinePanelComponent"} 271 "element": {"#": "timelinePanelComponent"},
272 "stage": {"@": "stage"}
272 }, 273 },
273 "bindings": { 274 "bindings": {
274 "currentDocument": {"<-": "@documentList.selectedObjects.0"} 275 "currentDocument": {"<-": "@documentList.selectedObjects.0"}