aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-09 18:05:33 -0700
committerJohn Mayhew2012-07-09 18:05:33 -0700
commite8d404a94365433a6c5f5bf41a52a4b92a1d52ae (patch)
tree3c63368ca98d1871e14a471cc45c9aa775f9fbc3
parent8e598f7764b64ae1a6c0395c6361dff4d2929b8b (diff)
downloadninja-e8d404a94365433a6c5f5bf41a52a4b92a1d52ae.tar.gz
fixed copyright messages for release
Diffstat
-rw-r--r--assets/descriptor.json1
-rw-r--r--credits.html4
-rwxr-xr-xindex.html2
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/tools/FillTool.js6
-rw-r--r--license.html27
-rw-r--r--node_modules/descriptor.json1
7 files changed, 23 insertions, 20 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2873205f..2cd21830 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -1,5 +1,4 @@
1{ 1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0", 2 "version": "0.0.0.0",
4 "root": "/assets/", 3 "root": "/assets/",
5 "directories": [{"name": "images"}, {"name": "shaders"}], 4 "directories": [{"name": "images"}, {"name": "shaders"}],
diff --git a/credits.html b/credits.html
index 7186096c..5181644c 100644
--- a/credits.html
+++ b/credits.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
66 </head> 66 </head>
67 67
68 <body> 68 <body>
69 <h2>Motorola Mobility, Inc. Ninja Third Party Credits</h2> 69 <h2>Motorola Mobility LLC, Ninja Third Party Credits</h2>
70 <div> 70 <div>
71 Dotted stroke drawing from Gavin Kistner 71 Dotted stroke drawing from Gavin Kistner
72 <ul> 72 <ul>
diff --git a/index.html b/index.html
index 70baec32..9f577697 100755
--- a/index.html
+++ b/index.html
@@ -305,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE.
305 305
306 <div id="splashScreenTextBlock" class="baseSplashScreenText"> 306 <div id="splashScreenTextBlock" class="baseSplashScreenText">
307 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p> 307 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
308 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p> 308 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
309 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p> 309 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p>
310 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p> 310 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p>
311 </div> 311 </div>
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index fd1e0754..a00748c8 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
50 <div id="about_box_ninja_logo"></div> 50 <div id="about_box_ninja_logo"></div>
51 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 51 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
52 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 52 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
53 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p> 53 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
54 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p> 54 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p>
55 <p>Ninja is available under <a href="license.html" target="_blank" class="aboutBoxAnchor">BSD License</a>.</p> 55 <p>Ninja is available under <a href="license.html" target="_blank" class="aboutBoxAnchor">BSD License</a>.</p>
56 </div> 56 </div>
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 886147e2..ddebaa07 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -29,12 +29,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32/* <copyright>
33This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
34No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
35(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
36</copyright> */
37
38var Montage = require("montage/core/core").Montage, 32var Montage = require("montage/core/core").Montage,
39 ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase, 33 ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase,
40 ElementsMediator = require("js/mediators/element-mediator").ElementMediator, 34 ElementsMediator = require("js/mediators/element-mediator").ElementMediator,
diff --git a/license.html b/license.html
index 3dff6743..5676a8bd 100644
--- a/license.html
+++ b/license.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
@@ -63,15 +63,26 @@ POSSIBILITY OF SUCH DAMAGE.
63 </head> 63 </head>
64 64
65 <body> 65 <body>
66 <h2>Motorola Mobility, Inc. Ninja BSD License</h2> 66 <h2>Motorola Mobility LLC, Ninja BSD License</h2>
67 <h2>Copyright &copy 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2> 67 <h2>Copyright &copy 2012, Motorola Mobility LLC. All rights reserved.</h2>
68 <p> 68 <p>
69 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br> 69 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
70 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br> 70 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br>
71 * 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> 71 * 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>
72 * 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 * Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.<br>
73 </p>
74 <p>
75 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br>
76 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br>
77 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br>
78 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE<br>
79 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br>
80 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<br>
81 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<br>
82 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<br>
83 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<br>
84 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br>
85 POSSIBILITY OF SUCH DAMAGE.
73 </p> 86 </p>
74 <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>
75 </body> 87 </body>
76
77</html> 88</html>
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index 9a2177c6..527e61c3 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -1,5 +1,4 @@
1{ 1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0", 2 "version": "0.0.0.0",
4 "root": "/node_modules/", 3 "root": "/node_modules/",
5 "directories": [ 4 "directories": [
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:13:07 +0000