Merge branch 'master' into gh-pages

2014-03-11 22:32:12 +01:00
parent e1dde5750d 29e4b85f32
commit ebf96bfebb
4 changed files with 27 additions and 25 deletions
@@ -85,7 +85,6 @@
  </div>

  <script src="js/animframe_polyfill.js"></script>
-  <script src="js/hammer.min.js"></script>
  <script src="js/keyboard_input_manager.js"></script>
  <script src="js/html_actuator.js"></script>
  <script src="js/grid.js"></script>