diff options
| author | Jonathan Duran | 2012-06-26 13:13:06 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-26 13:13:06 -0700 |
| commit | e07370c7946fcdfbe6e245840348306821f8cc39 (patch) | |
| tree | 406bc94c98b793a318cc326178765ee60846920b /js/ninja.reel/ninja.html | |
| parent | d9170ea8ac54aa2aefd43de15defb439e65fa1f3 (diff) | |
| parent | 8821e662484aedb027e26a873883e6ca3fb55a51 (diff) | |
| download | ninja-e07370c7946fcdfbe6e245840348306821f8cc39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 4 |
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":{ |