diff options
| 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/menu/menu-item.reel/menu-item.html | |
| parent | 6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff) | |
| parent | 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff) | |
| download | ninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz | |
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>
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.html')
| -rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.html | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html index 1902833a..ce46d857 100755 --- a/js/components/menu/menu-item.reel/menu-item.html +++ b/js/components/menu/menu-item.reel/menu-item.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" /> |