aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-06-27 12:10:17 -0700
committerJonathan Duran2012-06-27 12:10:17 -0700
commit50fba97d221041660f0757725ee46b3a6ceb3aa0 (patch)
tree0f245d6df5e79b564d4ed7751b540a0700a8e721 /js/panels/Timeline
parentae2067a09cd9cd0ee60eac7bd35395bf81045626 (diff)
parent749f5444487c326e50c790e4be9c91478f503867 (diff)
downloadninja-50fba97d221041660f0757725ee46b3a6ceb3aa0.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index f141fc1c..48ff7c8e 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -58,7 +58,7 @@
58 "value" : { 58 "value" : {
59 "boundObject" : {"@" : "owner"}, 59 "boundObject" : {"@" : "owner"},
60 "boundObjectPropertyPath" : "editorProperty", 60 "boundObjectPropertyPath" : "editorProperty",
61 "oneway" : false 61 "oneway" : true
62 } 62 }
63 } 63 }
64 } 64 }