diff options
author | Valerio Virgillito | 2012-02-14 11:22:21 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-14 11:22:21 -0800 |
commit | ab1466b2627e40f58afcaa3d425d4145fa47525a (patch) | |
tree | 5c0de8b4db67b07b0e745e776e99eabff989d804 /user-document-templates/montage-application-cloud/index.html | |
parent | 33c805d441abb2f83fd1ac9ee2d3d4282acc009f (diff) | |
parent | df898049b2990f456a305eb18434b887468225cf (diff) | |
download | ninja-ab1466b2627e40f58afcaa3d425d4145fa47525a.tar.gz |
Merge branch 'components' of https://github.com/mencio/ninja-internal into integration
Conflicts:
js/io/document/html-document.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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> |