aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-26 13:06:43 -0700
committerAnanya Sen2012-06-26 13:06:43 -0700
commitfc9186b7400dcc2b25c264a2f245603b73d2e429 (patch)
treec94b7b3e4bfe2726300a8dec0b8841ba4d6bf109 /js/ninja.reel
parent6075916ef18dc4a8cbea41c941d2d0b519360262 (diff)
parent8821e662484aedb027e26a873883e6ca3fb55a51 (diff)
downloadninja-fc9186b7400dcc2b25c264a2f245603b73d2e429.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index beae59d9..1bd002ae 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -261,10 +261,6 @@
261 } 261 }
262 }, 262 },
263 263
264 "mouseMediator": {
265 "prototype": "js/mediators/mouse-mediator"
266 },
267
268 "keyboardMediator": { 264 "keyboardMediator": {
269 "prototype": "js/mediators/keyboard-mediator", 265 "prototype": "js/mediators/keyboard-mediator",
270 "properties":{ 266 "properties":{