diff options
author | Jose Antonio Marquez | 2012-02-05 22:48:26 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-05 22:48:26 -0800 |
commit | 17bda238bc6973832394c0ba8fb08da09557931e (patch) | |
tree | 4f703c7d30f01cf4cc24ba8737cab4e1beca7d38 /js/ninja.reel/ninja.html | |
parent | 20803c71179bcffeaeaba4375bd06155d21dafe6 (diff) | |
parent | 62a5cad735a87d584272c6d4bf67328f2d4fa456 (diff) | |
download | ninja-17bda238bc6973832394c0ba8fb08da09557931e.tar.gz |
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 37c269e0..6630f4a8 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -274,6 +274,8 @@ | |||
274 | "name": "Ninja", | 274 | "name": "Ninja", |
275 | "properties": { | 275 | "properties": { |
276 | "element": {"#": "main"}, | 276 | "element": {"#": "main"}, |
277 | "rulerTop": {"#": "rulerTop"}, | ||
278 | "rulerLeft": {"#": "rulerLeft"}, | ||
277 | "appModel": {"@": "appModel"}, | 279 | "appModel": {"@": "appModel"}, |
278 | "toolsData": {"@": "toolsData1"}, | 280 | "toolsData": {"@": "toolsData1"}, |
279 | "toolsList": {"@": "toolsList1"}, | 281 | "toolsList": {"@": "toolsList1"}, |