aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /index.html
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'index.html')
-rwxr-xr-xindex.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/index.html b/index.html
index 00e8bc5e..0f1c6d51 100755
--- a/index.html
+++ b/index.html
@@ -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",