aboutsummaryrefslogtreecommitdiff
path: root/user-document-templates
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-14 11:07:21 -0800
committerValerio Virgillito2012-02-14 11:07:21 -0800
commitf060190a3bffd9a16718f2ce0499699103d46372 (patch)
treea308fe7eacec2156c8212dff0892a3de925d5f9a /user-document-templates
parentf766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff)
parent33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff)
downloadninja-f060190a3bffd9a16718f2ce0499699103d46372.tar.gz
Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration
Diffstat (limited to 'user-document-templates')
-rwxr-xr-x[-rw-r--r--]user-document-templates/montage-application-cloud/appdelegate.js0
-rwxr-xr-x[-rw-r--r--]user-document-templates/montage-application-cloud/default_html.css0
-rwxr-xr-x[-rw-r--r--]user-document-templates/montage-application-cloud/index.html11
-rwxr-xr-x[-rw-r--r--]user-document-templates/montage-application-cloud/package.json0
-rwxr-xr-x[-rw-r--r--]user-document-templates/montage-application-cloud/styles.css0
5 files changed, 6 insertions, 5 deletions
diff --git a/user-document-templates/montage-application-cloud/appdelegate.js b/user-document-templates/montage-application-cloud/appdelegate.js
index 3c21b46e..3c21b46e 100644..100755
--- a/user-document-templates/montage-application-cloud/appdelegate.js
+++ b/user-document-templates/montage-application-cloud/appdelegate.js
diff --git a/user-document-templates/montage-application-cloud/default_html.css b/user-document-templates/montage-application-cloud/default_html.css
index 68300edf..68300edf 100644..100755
--- a/user-document-templates/montage-application-cloud/default_html.css
+++ b/user-document-templates/montage-application-cloud/default_html.css
diff --git a/user-document-templates/montage-application-cloud/index.html b/user-document-templates/montage-application-cloud/index.html
index d1f9634d..63dd5926 100644..100755
--- a/user-document-templates/montage-application-cloud/index.html
+++ b/user-document-templates/montage-application-cloud/index.html
@@ -4,6 +4,7 @@
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> --> 6 </copyright> -->
7
7<html> 8<html>
8 9
9 <head> 10 <head>
@@ -34,15 +35,15 @@
34 35
35 <body> 36 <body>
36 37
37 <div id="userHead"></div> 38 <ninja-div id="userHead"></ninja-div>
38 39
39 <div id="stageBG" class="stageDimension stageContentShadow"></div> 40 <ninja-div id="stageBG" class="stageDimension stageContentShadow"></ninja-div>
40 41
41 <div id="Viewport" class="stageDimension"> 42 <ninja-div id="Viewport" class="stageDimension">
42 43
43 <div id="UserContent" class="stageView stageDimension global3DSettings"></div> 44 <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div>
44 45
45 </div> 46 </ninja-div>
46 47
47 </body> 48 </body>
48 49
diff --git a/user-document-templates/montage-application-cloud/package.json b/user-document-templates/montage-application-cloud/package.json
index 5466b3d7..5466b3d7 100644..100755
--- a/user-document-templates/montage-application-cloud/package.json
+++ b/user-document-templates/montage-application-cloud/package.json
diff --git a/user-document-templates/montage-application-cloud/styles.css b/user-document-templates/montage-application-cloud/styles.css
index 0441c1cf..0441c1cf 100644..100755
--- a/user-document-templates/montage-application-cloud/styles.css
+++ b/user-document-templates/montage-application-cloud/styles.css