Merge remote-tracking branch 'ninja-internal/master' into Timeline-local

author: Jon Reid 2012-02-24 13:04:35 -0800
committer: Jon Reid 2012-02-24 13:04:35 -0800
commit: ae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch)
tree: 5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/panels/Timeline/Layer.reel
parent: c615e1d305424f16f64aca16cf38da760a5eec87 (diff)
parent: 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download: ninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz
4 files changed, 23 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index df03cbb3..d30ef0e3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,9 @@
 <!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 lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index bc1dfb7f..e75b4d0f 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,3 +1,9 @@
+/* <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> */
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 var Collapser = require("js/panels/Timeline/Collapser").Collapser;
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 3d7ba963..18d0a5e3 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -1,4 +1,10 @@
 @charset "UTF-8";
+/* <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> */
 /* Layer.scss
 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
 */
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 0a83028b..1e574cc0 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,5 +1,11 @@
 @charset "UTF-8";
+/* <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> */
 /* Layer.scss
 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
 */
author	Jon Reid	2012-02-24 13:04:35 -0800
committer	Jon Reid	2012-02-24 13:04:35 -0800
commit	ae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch)
tree	5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/panels/Timeline/Layer.reel
parent	c615e1d305424f16f64aca16cf38da760a5eec87 (diff)
parent	8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download	ninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index df03cbb3..d30ef0e3 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,9 @@
1	<!DOCTYPE html>	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> -->
2	<html lang="en">	7	<html lang="en">
3	<head>	8	<head>
4	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />


diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index bc1dfb7f..e75b4d0f 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -1,3 +1,9 @@
		1	/* <copyright>
		2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
		3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
		4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
		5	</copyright> */
		6
1	var Montage = require("montage/core/core").Montage;	7	var Montage = require("montage/core/core").Montage;
2	var Component = require("montage/ui/component").Component;	8	var Component = require("montage/ui/component").Component;
3	var Collapser = require("js/panels/Timeline/Collapser").Collapser;	9	var Collapser = require("js/panels/Timeline/Collapser").Collapser;


diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css index 3d7ba963..18d0a5e3 100644 --- a/js/panels/Timeline/Layer.reel/css/Layer.css +++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -1,4 +1,10 @@
1	@charset "UTF-8";	1	@charset "UTF-8";
		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
2	/* Layer.scss	8	/* Layer.scss
3	* Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.	9	* Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
4	*/	10	*/


diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index 0a83028b..1e574cc0 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,5 +1,11 @@
1	@charset "UTF-8";	1	@charset "UTF-8";
2		2
		3	/* <copyright>
		4	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
		5	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
		6	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
		7	</copyright> */
		8
3	/* Layer.scss	9	/* Layer.scss
4	* Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.	10	* Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
5	*/	11	*/