diff options
author | Ananya Sen | 2012-07-20 12:19:09 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-20 12:19:09 -0700 |
commit | bf4bd611e6fadf45fa9dc50ad72902040075ff0c (patch) | |
tree | 6fcb99cc7f497dfdddb7fd0e00b80a9c7c911099 /js/ninja.reel/ninja.html | |
parent | 0d414eaeae13bb520e52ddace0a83c03eb9e7769 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-bf4bd611e6fadf45fa9dc50ad72902040075ff0c.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 3 |
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"} |