merge conflict

2014-03-11 14:49:07 +01:00
parent 16a6ecfca6 d2315af2ec
commit 347e11f1dc
2 changed files with 27 additions and 0 deletions
@@ -78,6 +78,7 @@
    </div>
  </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>