Merge pull request #373 from kriskowal/bsd

Update copyright boilerplate
author: Valerio Virgillito 2012-07-06 11:19:18 -0700
committer: Valerio Virgillito 2012-07-06 11:19:18 -0700
commit: 3f150fc48eac445fae7ca44309426becaaa21038 (patch)
tree: 515dcf263100f3f2098a2dc4679aee0d4c2668ca /js/panels/Timeline/TrackSpacer.reel
parent: fcae5717dab144c4d961b94510aed11d01568345 (diff)
parent: a869cd3619b783e29cf320f46713b0c790edb15f (diff)
download: ninja-3f150fc48eac445fae7ca44309426becaaa21038.tar.gz
3 files changed, 86 insertions, 14 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index 54944e5d..b02e761e 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.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 lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -27,4 +51,4 @@
        </div>
    </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
index f1b5407a..50a949f8 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
@@ -1,8 +1,32 @@
 /* <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> */
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
index b98b555d..bfdea55b 100644
--- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
+++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
@@ -1,11 +1,35 @@
 /* <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> */
 .trackspacer{
    height:22px;
    width: 100%;
    background-color: #4d4d4d;
-}
-\ No newline at end of file
+}
author	Valerio Virgillito	2012-07-06 11:19:18 -0700
committer	Valerio Virgillito	2012-07-06 11:19:18 -0700
commit	3f150fc48eac445fae7ca44309426becaaa21038 (patch)
tree	515dcf263100f3f2098a2dc4679aee0d4c2668ca /js/panels/Timeline/TrackSpacer.reel
parent	fcae5717dab144c4d961b94510aed11d01568345 (diff)
parent	a869cd3619b783e29cf320f46713b0c790edb15f (diff)
download	ninja-3f150fc48eac445fae7ca44309426becaaa21038.tar.gz

diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html index 54944e5d..b02e761e 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.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 lang="en">	31	<html lang="en">
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" />
@@ -27,4 +51,4 @@
27	</div>	51	</div>
28		52
29	</body>	53	</body>
30	</html> \ No newline at end of file	54	</html>


diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js index f1b5407a..50a949f8 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
@@ -1,8 +1,32 @@
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	</copyright> */	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.
		29	</copyright> */
6		30
7	var Montage = require("montage/core/core").Montage;	31	var Montage = require("montage/core/core").Montage;
8	var Component = require("montage/ui/component").Component;	32	var Component = require("montage/ui/component").Component;


diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css index b98b555d..bfdea55b 100644 --- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css +++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
@@ -1,11 +1,35 @@
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	</copyright> */	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.
		29	</copyright> */
6		30
7	.trackspacer{	31	.trackspacer{
8	height:22px;	32	height:22px;
9	width: 100%;	33	width: 100%;
10	background-color: #4d4d4d;	34	background-color: #4d4d4d;
11	} \ No newline at end of file	35	}