aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-06 11:18:30 -0800
committerJose Antonio Marquez2012-03-06 11:18:30 -0800
commit3c4967fa93b3abc529fc404115707307ba72d5cd (patch)
treef3737db979727ee050f8b9c85ef994b0e6ddae27 /js/ninja.reel/ninja.html
parentbee2df0d4da72677aaa2adae669ffdd4ac210dd6 (diff)
parent84332ab81c1b445195f1d9be8bbeae0725c8e758 (diff)
downloadninja-3c4967fa93b3abc529fc404115707307ba72d5cd.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 112f844e..cdf53ddf 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -16,12 +16,6 @@
16 16
17 <script type="text/montage-serialization"> 17 <script type="text/montage-serialization">
18 { 18 {
19
20 "preloader1": {
21 "module": "js/preloader/preloader",
22 "name": "Preloader"
23 },
24
25 "localStorage": { 19 "localStorage": {
26 "module": "js/controllers/local-storage-controller", 20 "module": "js/controllers/local-storage-controller",
27 "name": "LocalStorage" 21 "name": "LocalStorage"
@@ -37,6 +31,11 @@
37 "name": "AppModel" 31 "name": "AppModel"
38 }, 32 },
39 33
34 "materialsModel": {
35 "module": "js/models/materials-model",
36 "name": "MaterialsModel"
37 },
38
40 "menu": { 39 "menu": {
41 "module": "js/components/menu/menu.reel", 40 "module": "js/components/menu/menu.reel",
42 "name": "Menu", 41 "name": "Menu",