Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode

Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
author: Kruti Shah 2012-07-09 11:27:16 -0700
committer: Kruti Shah 2012-07-09 11:27:16 -0700
commit: 5ad509e46add1b45d15d1c493e18a5c52a462654 (patch)
tree: 93cd416cd7060e3688f33545f70956f787f6886f /js/components/layout/document-entry.reel/document-entry.html
parent: 6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff)
parent: 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
download: ninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz
1 files changed, 29 insertions, 5 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index ebaa4ccd..4d89d6d7 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.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" />
@@ -42,4 +66,4 @@
            <button type="button" class="documentCloseButton" data-montage-id="close-btn"></button>
        </li>
    </body>
-</html>
-\ No newline at end of file
+</html>
author	Kruti Shah	2012-07-09 11:27:16 -0700
committer	Kruti Shah	2012-07-09 11:27:16 -0700
commit	5ad509e46add1b45d15d1c493e18a5c52a462654 (patch)
tree	93cd416cd7060e3688f33545f70956f787f6886f /js/components/layout/document-entry.reel/document-entry.html
parent	6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff)
parent	39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
download	ninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz

diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index ebaa4ccd..4d89d6d7 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.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" />
@@ -42,4 +66,4 @@
42	<button type="button" class="documentCloseButton" data-montage-id="close-btn"></button>	66	<button type="button" class="documentCloseButton" data-montage-id="close-btn"></button>
43	</li>	67	</li>
44	</body>	68	</body>
45	</html> \ No newline at end of file	69	</html>