Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /license.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 27 insertions, 27 deletions
diff --git a/license.html b/license.html
index fb1449db..999b24af 100644
--- a/license.html
+++ b/license.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -30,38 +30,38 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html>
-        <head lang="en">
+    <head lang="en">
-                <title>Ninja License</title>
+        <title>Ninja License</title>
-                
-        <meta charset="utf-8"/>
-            <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-        <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
-            <meta http-equiv="Pragma" content="no-store, no-cache" />
-            <meta http-equiv="Expires" content="0" />
-        
-        <link rel="icon" href="images/favicon.png" sizes="16x16">
-        
-        <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
-        
-        <style type="text/css">
-                        html, body
+        <meta charset="utf-8"/>
-                        {
+        <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-                                width: 98%;
+        <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
-                                height: 98%;
+        <meta http-equiv="Pragma" content="no-store, no-cache" />
-                                overflow: hidden;
+        <meta http-equiv="Expires" content="0" />
-                                background: white;
-                                margin: 0;
+        <link rel="icon" href="images/favicon.png" sizes="16x16">
-                                padding: 0;
+        <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
+        <style type="text/css">
+            html, body
+            {
+                width: 98%;
+                height: 98%;
+                overflow: hidden;
+                background: white;
+                margin: 0;
+                padding: 0;
                color: black;
                text-align: left;
                font-family: Arial;
                margin: 1%;
-                        }
+            }
-                </style>
+        </style>
    </head>
-        <body>
+    <body>
    <h2>Motorola Mobility, Inc. Ninja BSD License</h2>
    <h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2>
    <p>
@@ -71,6 +71,6 @@ POSSIBILITY OF SUCH DAMAGE.
      * Neither the name of the Motorola Mobility Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.<br>
    </p>
    <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Motorola Mobility Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-        </body>
+    </body>
 </html>
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /license.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/license.html b/license.html index fb1449db..999b24af 100644 --- a/license.html +++ b/license.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.
@@ -30,38 +30,38 @@ POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html>	31	<html>
32		32
33	<head lang="en">	33	<head lang="en">
34	<title>Ninja License</title>	34	<title>Ninja License</title>
35
36	<meta charset="utf-8"/>
37	<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
38	<meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
39	<meta http-equiv="Pragma" content="no-store, no-cache" />
40	<meta http-equiv="Expires" content="0" />
41
42	<link rel="icon" href="images/favicon.png" sizes="16x16">
43
44	<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700\|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
45
46	<style type="text/css">
47		35
48	html, body	36	<meta charset="utf-8"/>
49	{	37	<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
50	width: 98%;	38	<meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
51	height: 98%;	39	<meta http-equiv="Pragma" content="no-store, no-cache" />
52	overflow: hidden;	40	<meta http-equiv="Expires" content="0" />
53	background: white;	41
54	margin: 0;	42	<link rel="icon" href="images/favicon.png" sizes="16x16">
55	padding: 0;	43
		44	<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700\|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
		45
		46	<style type="text/css">
		47
		48	html, body
		49	{
		50	width: 98%;
		51	height: 98%;
		52	overflow: hidden;
		53	background: white;
		54	margin: 0;
		55	padding: 0;
56	color: black;	56	color: black;
57	text-align: left;	57	text-align: left;
58	font-family: Arial;	58	font-family: Arial;
59	margin: 1%;	59	margin: 1%;
60	}	60	}
61	</style>	61	</style>
62	</head>	62	</head>
63		63
64	<body>	64	<body>
65	<h2>Motorola Mobility, Inc. Ninja BSD License</h2>	65	<h2>Motorola Mobility, Inc. Ninja BSD License</h2>
66	<h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2>	66	<h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2>
67	<p>	67	<p>
@@ -71,6 +71,6 @@ POSSIBILITY OF SUCH DAMAGE.
71	* Neither the name of the Motorola Mobility Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.<br>	71	* Neither the name of the Motorola Mobility Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.<br>
72	</p>	72	</p>
73	<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Motorola Mobility Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>	73	<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Motorola Mobility Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
74	</body>	74	</body>
75		75
76	</html>	76	</html>