Merge branch 'refs/heads/master' into local-storage-version

author: Valerio Virgillito 2012-02-24 10:39:39 -0800
committer: Valerio Virgillito 2012-02-24 10:39:39 -0800
commit: 60845326f5313b7e34f0ad8d9815bc6605ed4c18 (patch)
tree: 2357eb8c914f57b7da71982d454ca2b4b9a2dee3 /js/panels/Timeline/TimelineTrack.reel
parent: afc53c6f553c97ab778154154aa2b7a146cb5fef (diff)
parent: 23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
download: ninja-60845326f5313b7e34f0ad8d9815bc6605ed4c18.tar.gz
4 files changed, 24 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index cabd92c0..158d666e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 61da9e36..0c5121cd 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
index 7a778e25..57e4dce6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,4 +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> */
 /* TimelineTrack.scss
 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
 */
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index 43d5f438..1b025c74 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.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> */
 /* TimelineTrack.scss
 * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
 */
author	Valerio Virgillito	2012-02-24 10:39:39 -0800
committer	Valerio Virgillito	2012-02-24 10:39:39 -0800
commit	60845326f5313b7e34f0ad8d9815bc6605ed4c18 (patch)
tree	2357eb8c914f57b7da71982d454ca2b4b9a2dee3 /js/panels/Timeline/TimelineTrack.reel
parent	afc53c6f553c97ab778154154aa2b7a146cb5fef (diff)
parent	23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
download	ninja-60845326f5313b7e34f0ad8d9815bc6605ed4c18.tar.gz

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index cabd92c0..158d666e 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 61da9e36..0c5121cd 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css index 7a778e25..57e4dce6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css +++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -1,4 +1,11 @@
1	@charset "UTF-8";	1	@charset "UTF-8";
		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
2	/* TimelineTrack.scss	9	/* TimelineTrack.scss
3	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.	10	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
4	*/	11	*/


diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss index 43d5f438..1b025c74 100644 --- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss +++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.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	/* TimelineTrack.scss	9	/* TimelineTrack.scss
4	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.	10	* Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
5	*/	11	*/