diff options
author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /index.html | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'index.html')
-rwxr-xr-x | index.html | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -224,8 +224,7 @@ | |||
224 | <script type="text/montage-serialization"> | 224 | <script type="text/montage-serialization"> |
225 | { | 225 | { |
226 | "owner": { | 226 | "owner": { |
227 | "module": "montage/ui/loader.reel", | 227 | "prototype": "montage/ui/loader.reel", |
228 | "name": "Loader", | ||
229 | "properties": { | 228 | "properties": { |
230 | "mainModule": "js/ninja.reel", | 229 | "mainModule": "js/ninja.reel", |
231 | "mainName": "Ninja", | 230 | "mainName": "Ninja", |