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

Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
author: Armen Kesablyan 2012-02-13 11:59:19 -0800
committer: Armen Kesablyan 2012-02-13 11:59:19 -0800
commit: 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch)
tree: 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /license.html
parent: 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff)
parent: e142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
download: ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz
1 files changed, 52 insertions, 0 deletions
diff --git a/license.html b/license.html
new file mode 100644
index 00000000..d86c6cd4
--- /dev/null
+++ b/license.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>
+        <head lang="en">
+                <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
+                        {
+                                width: 98%;
+                                height: 98%;
+                                overflow: hidden;
+                                background: white;
+                                margin: 0;
+                                padding: 0;
+                color: black;
+                text-align: left;
+                font-family: Arial;
+                margin: 1%;
+                        }
+                </style>
+    </head>
+        <body>
+    <h2>Motorola Mobility, Inc. Ninja BSD License</h2>
+    <h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2>
+    <p>
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
+      * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br>
+      * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.<br>
+      * 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>
+</html>
author	Armen Kesablyan	2012-02-13 11:59:19 -0800
committer	Armen Kesablyan	2012-02-13 11:59:19 -0800
commit	90d0c8c0e98d062c628c061fe5765ce991fda409 (patch)
tree	9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /license.html
parent	8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff)
parent	e142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
download	ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz

diff --git a/license.html b/license.html new file mode 100644 index 00000000..d86c6cd4 --- /dev/null +++ b/license.html
@@ -0,0 +1,52 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	This file contains proprietary software owned by Motorola Mobility, Inc.<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.
	6	</copyright> -->
	7	<html>
	8
	9	<head lang="en">
	10	<title>Ninja License</title>
	11
	12	<meta charset="utf-8"/>
	13	<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
	14	<meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" />
	15	<meta http-equiv="Pragma" content="no-store, no-cache" />
	16	<meta http-equiv="Expires" content="0" />
	17
	18	<link rel="icon" href="images/favicon.png" sizes="16x16">
	19
	20	<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700\|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
	21
	22	<style type="text/css">
	23
	24	html, body
	25	{
	26	width: 98%;
	27	height: 98%;
	28	overflow: hidden;
	29	background: white;
	30	margin: 0;
	31	padding: 0;
	32	color: black;
	33	text-align: left;
	34	font-family: Arial;
	35	margin: 1%;
	36	}
	37	</style>
	38	</head>
	39
	40	<body>
	41	<h2>Motorola Mobility, Inc. Ninja BSD License</h2>
	42	<h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2>
	43	<p>
	44	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
	45	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br>
	46	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.<br>
	47	* 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>
	48	</p>
	49	<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>
	50	</body>
	51
	52	</html>