diff options
| author | Nivesh Rajbhandari | 2012-07-09 11:52:02 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-07-09 11:52:02 -0700 |
| commit | febfdb18042d1c73ac58ee4e35c5f176428dee00 (patch) | |
| tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /license.html | |
| parent | ac27d538af33ca8d67d3d88729f49c05793afda7 (diff) | |
| parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
| download | ninja-febfdb18042d1c73ac58ee4e35c5f176428dee00.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Conflicts:
js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
js/panels/Materials/materials-popup.reel/materials-popup.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'license.html')
| -rw-r--r-- | license.html | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/license.html b/license.html index d86c6cd4..fb1449db 100644 --- a/license.html +++ b/license.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 | 32 | ||
| 9 | <head lang="en"> | 33 | <head lang="en"> |