aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-20 09:52:03 -0700
committerJose Antonio Marquez2012-07-20 09:52:03 -0700
commit5d82978e9a0e0daf7c457ff87be95a3b4301999e (patch)
tree906f908fef755b8e0f57ab7a0d9ce348c398958b /js/ninja.reel/ninja.html
parenta8b7648d2c1305eb068d42ebde9b042ee6de72ab (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-5d82978e9a0e0daf7c457ff87be95a3b4301999e.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
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"}