diff options
| author | Jonathan Duran | 2012-07-09 08:58:33 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-09 08:58:33 -0700 |
| commit | f20b1985dd672d36db1dc61fa30c53d9af6aacef (patch) | |
| tree | 2086c531d8f884471a2ff33574a93f1d8b40b487 /js/components/popup-manager.reel/popup-manager.html | |
| parent | d01efeb5918622783f1315136ccdb38f82ad33bb (diff) | |
| parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
| download | ninja-f20b1985dd672d36db1dc61fa30c53d9af6aacef.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/popup-manager.reel/popup-manager.html')
| -rwxr-xr-x | js/components/popup-manager.reel/popup-manager.html | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 399a2115..281477f1 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html | |||
| @@ -1,9 +1,33 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc. | 4 | Copyright (c) 2012, Motorola Mobility, Inc |
| 5 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. | 5 | All Rights Reserved. |
| 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 6 | BSD License. |
| 7 | |||
| 8 | Redistribution and use in source and binary forms, with or without | ||
| 9 | modification, are permitted provided that the following conditions are met: | ||
| 10 | |||
| 11 | - Redistributions of source code must retain the above copyright notice, | ||
| 12 | this list of conditions and the following disclaimer. | ||
| 13 | - Redistributions in binary form must reproduce the above copyright | ||
| 14 | notice, this list of conditions and the following disclaimer in the | ||
| 15 | documentation and/or other materials provided with the distribution. | ||
| 16 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
| 17 | may be used to endorse or promote products derived from this software | ||
| 18 | without specific prior written permission. | ||
| 19 | |||
| 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| 27 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| 28 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| 30 | POSSIBILITY OF SUCH DAMAGE. | ||
| 7 | </copyright> | 31 | </copyright> |
| 8 | --> | 32 | --> |
| 9 | <html lang="en"> | 33 | <html lang="en"> |
| @@ -30,4 +54,4 @@ | |||
| 30 | 54 | ||
| 31 | </body> | 55 | </body> |
| 32 | 56 | ||
| 33 | </html> \ No newline at end of file | 57 | </html> |