aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-26 13:13:17 -0700
committerKruti Shah2012-06-26 13:13:17 -0700
commit442793352b352be9f2679fab2e5b4bad186f228a (patch)
treee9774d784cde6f2d701e5fac8228c5e13339afe6 /js/ninja.reel
parent0217858c93c54c9b65da4c4c52730a5221664ea8 (diff)
parent8821e662484aedb027e26a873883e6ca3fb55a51 (diff)
downloadninja-442793352b352be9f2679fab2e5b4bad186f228a.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
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":{