diff options
author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
tree | b044208c38770c0c4edce03379071dbf2eb29b83 /user-document-templates/montage-application-cloud/index.html | |
parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'user-document-templates/montage-application-cloud/index.html')
-rwxr-xr-x | user-document-templates/montage-application-cloud/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user-document-templates/montage-application-cloud/index.html b/user-document-templates/montage-application-cloud/index.html index 63dd5926..49931969 100755 --- a/user-document-templates/montage-application-cloud/index.html +++ b/user-document-templates/montage-application-cloud/index.html | |||
@@ -25,8 +25,8 @@ | |||
25 | <script type="text/montage-serialization"> | 25 | <script type="text/montage-serialization"> |
26 | { | 26 | { |
27 | "owner": { | 27 | "owner": { |
28 | "module": "./appdelegate", | 28 | "module": "main.reel", |
29 | "name": "MyAppDelegate" | 29 | "name": "Main" |
30 | } | 30 | } |
31 | } | 31 | } |
32 | </script> | 32 | </script> |