aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorhwc4872012-03-06 16:03:26 -0800
committerhwc4872012-03-06 16:03:26 -0800
commit855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch)
tree60d7f091fcf0870495aeaa63748492dbd558619d /index.html
parent1207735f05f202b5bdc5f70c73445f8e0934a227 (diff)
parent4f498b43264327f5886e0370bd3536453d47570a (diff)
downloadninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/preloader/Preloader.js
Diffstat (limited to 'index.html')
-rwxr-xr-xindex.html16
1 files changed, 13 insertions, 3 deletions
diff --git a/index.html b/index.html
index 30d6aea7..d385e4ba 100755
--- a/index.html
+++ b/index.html
@@ -18,8 +18,9 @@
18 <meta http-equiv="Expires" content="0" /> 18 <meta http-equiv="Expires" content="0" />
19 19
20 <link rel="icon" href="images/favicon.png" sizes="16x16"> 20 <link rel="icon" href="images/favicon.png" sizes="16x16">
21 21
22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> 22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
23 <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/>
23 24
24 <style type="text/css"> 25 <style type="text/css">
25 html, body 26 html, body
@@ -174,6 +175,15 @@
174 }; 175 };
175 </script> 176 </script>
176 177
178 <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script>
179 <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script>
180
181 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script>
182 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script>
183 <script type="text/javascript" src="imports/codemirror/mode/xml/xml.js"></script>
184 <script type="text/javascript" src="imports/codemirror/mode/javascript/javascript.js"></script>
185 <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script>
186
177 <script type="text/javascript" src="node_modules/montage/montage.js"></script> 187 <script type="text/javascript" src="node_modules/montage/montage.js"></script>
178 188
179 <script type="text/montage-serialization"> 189 <script type="text/montage-serialization">
@@ -184,7 +194,7 @@
184 "properties": { 194 "properties": {
185 "mainModule": "js/ninja.reel", 195 "mainModule": "js/ninja.reel",
186 "mainName": "Ninja", 196 "mainName": "Ninja",
187 "minimumBootstrappingDuration": 4000 197 "minimumBootstrappingDuration": 3000
188 } 198 }
189 } 199 }
190 } 200 }