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

author: John Mayhew 2012-07-09 09:53:20 -0700
committer: John Mayhew 2012-07-09 09:53:20 -0700
commit: 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (patch)
tree: 952bc35b3c9d58a02e1609757981bf4ccf4af449 /js/components/tools-properties/object3d-properties.reel
parent: 31e63b442631f1c7dff34a661e40e703cb42dea5 (diff)
parent: aedd14b18695d031f695d27dfbd94df5614495bb (diff)
download: ninja-8c5ecaf90062f9e030386f338bdc19fd62b826c8.tar.gz
2 files changed, 57 insertions, 9 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 70ed79f9..93d1abfe 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -1,9 +1,33 @@
 <!DOCTYPE HTML>
 <!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
- </copyright> -->
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - 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.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+</copyright> -->
 <html>
    <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -37,4 +61,4 @@
        </div>
    </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
index 33ef3394..e390e825 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -1,7 +1,31 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - 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.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
 </copyright> */
 var Montage = require("montage/core/core").Montage;
@@ -49,4 +73,4 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
    }
-});
-\ No newline at end of file
+});
author	John Mayhew	2012-07-09 09:53:20 -0700
committer	John Mayhew	2012-07-09 09:53:20 -0700
commit	8c5ecaf90062f9e030386f338bdc19fd62b826c8 (patch)
tree	952bc35b3c9d58a02e1609757981bf4ccf4af449 /js/components/tools-properties/object3d-properties.reel
parent	31e63b442631f1c7dff34a661e40e703cb42dea5 (diff)
parent	aedd14b18695d031f695d27dfbd94df5614495bb (diff)
download	ninja-8c5ecaf90062f9e030386f338bdc19fd62b826c8.tar.gz

diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 70ed79f9..93d1abfe 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -1,9 +1,33 @@
1	<!DOCTYPE HTML>	1	<!DOCTYPE HTML>
2	<!-- <copyright>	2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	3	Copyright (c) 2012, Motorola Mobility, Inc
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	4	All Rights Reserved.
5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	5	BSD License.
6	</copyright> -->	6
		7	Redistribution and use in source and binary forms, with or without
		8	modification, are permitted provided that the following conditions are met:
		9
		10	- Redistributions of source code must retain the above copyright notice,
		11	this list of conditions and the following disclaimer.
		12	- Redistributions in binary form must reproduce the above copyright
		13	notice, this list of conditions and the following disclaimer in the
		14	documentation and/or other materials provided with the distribution.
		15	- Neither the name of Motorola Mobility nor the names of its contributors
		16	may be used to endorse or promote products derived from this software
		17	without specific prior written permission.
		18
		19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		29	POSSIBILITY OF SUCH DAMAGE.
		30	</copyright> -->
7	<html>	31	<html>
8	<head>	32	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -37,4 +61,4 @@
37	</div>	61	</div>
38	</body>	62	</body>
39		63
40	</html> \ No newline at end of file	64	</html>


diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js index 33ef3394..e390e825 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -1,7 +1,31 @@
1	/* <copyright>	1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	2	Copyright (c) 2012, Motorola Mobility, Inc
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	All Rights Reserved.
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	BSD License.
		5
		6	Redistribution and use in source and binary forms, with or without
		7	modification, are permitted provided that the following conditions are met:
		8
		9	- Redistributions of source code must retain the above copyright notice,
		10	this list of conditions and the following disclaimer.
		11	- Redistributions in binary form must reproduce the above copyright
		12	notice, this list of conditions and the following disclaimer in the
		13	documentation and/or other materials provided with the distribution.
		14	- Neither the name of Motorola Mobility nor the names of its contributors
		15	may be used to endorse or promote products derived from this software
		16	without specific prior written permission.
		17
		18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		28	POSSIBILITY OF SUCH DAMAGE.
5	</copyright> */	29	</copyright> */
6		30
7	var Montage = require("montage/core/core").Montage;	31	var Montage = require("montage/core/core").Montage;
@@ -49,4 +73,4 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
49	}	73	}
50		74
51		75
52	}); \ No newline at end of file	76	});