Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/history-panel
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
2 files changed, 14 insertions, 14 deletions
diff --git a/js/panels/history-panel/history-item.reel/history-item.html b/js/panels/history-panel/history-item.reel/history-item.html
index f6a4e68f..c9d1b276 100644
--- a/js/panels/history-panel/history-item.reel/history-item.html
+++ b/js/panels/history-panel/history-item.reel/history-item.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="history-item.css">
+        <link rel="stylesheet" type="text/css" href="history-item.css">
        <script type="text/montage-serialization">
        {
@@ -44,8 +44,8 @@ POSSIBILITY OF SUCH DAMAGE.
        }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
        <li data-montage-id="history_item"></li>
diff --git a/js/panels/history-panel/history.reel/history.html b/js/panels/history-panel/history.reel/history.html
index 1bcf817a..e619d9ed 100644
--- a/js/panels/history-panel/history.reel/history.html
+++ b/js/panels/history-panel/history.reel/history.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="history.css">
+        <link rel="stylesheet" type="text/css" href="history.css">
        <script type="text/montage-serialization">
        {
@@ -112,10 +112,10 @@ POSSIBILITY OF SUCH DAMAGE.
        }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="history_panel" class="history_panel">
+        <div data-montage-id="history_panel" class="history_panel">
            <div data-montage-id="scroller" class="scroller">
                <ul data-montage-id="undo_list" class="undo_list">
                    <li data-montage-id="undo_item"></li>
@@ -124,7 +124,7 @@ POSSIBILITY OF SUCH DAMAGE.
                    <li data-montage-id="redo_item"></li>
                </ul>
            </div>
-        </div>
+        </div>
    </body>
 </html>
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/history-panel
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/panels/history-panel/history-item.reel/history-item.html b/js/panels/history-panel/history-item.reel/history-item.html index f6a4e68f..c9d1b276 100644 --- a/js/panels/history-panel/history-item.reel/history-item.html +++ b/js/panels/history-panel/history-item.reel/history-item.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="history-item.css">	34	<link rel="stylesheet" type="text/css" href="history-item.css">
35		35
36	<script type="text/montage-serialization">	36	<script type="text/montage-serialization">
37	{	37	{
@@ -44,8 +44,8 @@ POSSIBILITY OF SUCH DAMAGE.
44	}	44	}
45	</script>	45	</script>
46		46
47	</head>	47	</head>
48	<body>	48	<body>
49		49
50	<li data-montage-id="history_item"></li>	50	<li data-montage-id="history_item"></li>
51		51


diff --git a/js/panels/history-panel/history.reel/history.html b/js/panels/history-panel/history.reel/history.html index 1bcf817a..e619d9ed 100644 --- a/js/panels/history-panel/history.reel/history.html +++ b/js/panels/history-panel/history.reel/history.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="history.css">	34	<link rel="stylesheet" type="text/css" href="history.css">
35		35
36	<script type="text/montage-serialization">	36	<script type="text/montage-serialization">
37	{	37	{
@@ -112,10 +112,10 @@ POSSIBILITY OF SUCH DAMAGE.
112	}	112	}
113	</script>	113	</script>
114		114
115	</head>	115	</head>
116	<body>	116	<body>
117		117
118	<div data-montage-id="history_panel" class="history_panel">	118	<div data-montage-id="history_panel" class="history_panel">
119	<div data-montage-id="scroller" class="scroller">	119	<div data-montage-id="scroller" class="scroller">
120	<ul data-montage-id="undo_list" class="undo_list">	120	<ul data-montage-id="undo_list" class="undo_list">
121	<li data-montage-id="undo_item"></li>	121	<li data-montage-id="undo_item"></li>
@@ -124,7 +124,7 @@ POSSIBILITY OF SUCH DAMAGE.
124	<li data-montage-id="redo_item"></li>	124	<li data-montage-id="redo_item"></li>
125	</ul>	125	</ul>
126	</div>	126	</div>
127	</div>	127	</div>
128		128
129	</body>	129	</body>
130	</html>	130	</html>