diff options
author | hwc487 | 2012-07-10 09:16:36 -0700 |
---|---|---|
committer | hwc487 | 2012-07-10 09:16:36 -0700 |
commit | 05542267c8c443a995a2221a2e7976d9894850ba (patch) | |
tree | 9eab323c983bdf6fe4a1a22c284c913a74013fa6 /license.html | |
parent | 7e5c17d1732606b3e32da054e73fe42813cf7326 (diff) | |
parent | f83c329796eae9f11630b0d58d1b21d1ff71655a (diff) | |
download | ninja-05542267c8c443a995a2221a2e7976d9894850ba.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Diffstat (limited to 'license.html')
-rw-r--r-- | license.html | 62 |
1 files changed, 38 insertions, 24 deletions
diff --git a/license.html b/license.html index 999b24af..e900b16f 100644 --- a/license.html +++ b/license.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!doctype html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | 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 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -45,32 +46,45 @@ POSSIBILITY OF SUCH DAMAGE. | |||
45 | 46 | ||
46 | <style type="text/css"> | 47 | <style type="text/css"> |
47 | 48 | ||
48 | html, body | 49 | html, body { |
49 | { | ||
50 | width: 98%; | 50 | width: 98%; |
51 | height: 98%; | 51 | height: 98%; |
52 | overflow: hidden; | 52 | overflow: hidden; |
53 | background: white; | 53 | background: white; |
54 | margin: 0; | ||
55 | padding: 0; | 54 | padding: 0; |
56 | color: black; | 55 | color: black; |
57 | text-align: left; | 56 | text-align: left; |
58 | font-family: Arial; | 57 | font-family: Arial, Helvetica, sans-serif; |
59 | margin: 1%; | 58 | margin: 1%; |
60 | } | 59 | } |
60 | |||
61 | </style> | 61 | </style> |
62 | </head> | 62 | </head> |
63 | 63 | ||
64 | <body> | 64 | <body> |
65 | <h2>Motorola Mobility, Inc. Ninja BSD License</h2> | 65 | <h2>Ninja BSD License</h2> |
66 | <h2>Copyright © 2010-2012, Motorola Mobility, Inc. All rights reserved.</h2> | 66 | <h2>Copyright © 2012, Motorola Mobility LLC. All rights reserved.</h2> |
67 | <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p> | ||
68 | |||
69 | <ul> | ||
70 | <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li> | ||
71 | <li>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.</li> | ||
72 | <li>Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.</li> | ||
73 | </ul> | ||
74 | |||
67 | <p> | 75 | <p> |
68 | Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br> | 76 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br> |
69 | * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br> | 77 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br> |
70 | * 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.<br> | 78 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br> |
71 | * Neither the name of the Motorola Mobility Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.<br> | 79 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE<br> |
80 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br> | ||
81 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF<br> | ||
82 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS<br> | ||
83 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN<br> | ||
84 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)<br> | ||
85 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br> | ||
86 | POSSIBILITY OF SUCH DAMAGE. | ||
72 | </p> | 87 | </p> |
73 | <p>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 Motorola Mobility Inc. 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.</p> | ||
74 | </body> | 88 | </body> |
75 | 89 | ||
76 | </html> | 90 | </html> |