Merge branch 'master' into gh-pages

2014-03-10 18:56:17 +01:00
parent 9d48120a14 b3c822c7d5
commit 2125c04a68
6 changed files with 65 additions and 1 deletions
@@ -6,12 +6,17 @@

  <link href="style/main.css" rel="stylesheet" type="text/css">

+  <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>
  <script src="js/tile.js"></script>
  <script src="js/game_manager.js"></script>
  <script src="js/application.js"></script>
+
+  <meta name="HandheldFriendly" content="True">
+  <meta name="MobileOptimized" content="320">
+  <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0, maximum-scale=1, user-scalable=no">
 </head>
 <body>
  <div class="container">