merge conflict

2014-03-11 14:31:12 +01:00
parent 50a4f29844 53b0bd2e17
commit 1cfb14c467
2 changed files with 12 additions and 13 deletions
@@ -1,6 +1,4 @@
-document.addEventListener("DOMContentLoaded", function () {
-  // Wait till the browser is ready to render the game (avoids glitches)
-  window.requestAnimationFrame(function () {
-    var manager = new GameManager(4, KeyboardInputManager, HTMLActuator);
-  });
+// Wait till the browser is ready to render the game (avoids glitches)
+window.requestAnimationFrame(function () {
+  var manager = new GameManager(4, KeyboardInputManager, HTMLActuator);
 });