diff options
| author | Valerio Virgillito | 2012-07-09 18:21:28 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 18:21:28 -0700 |
| commit | b2b1d24d6c5741f7cd6e920edfe8781aa9efce1b (patch) | |
| tree | 94391682560241ad9df275236b15ffc1629f389a | |
| parent | 5c1aee729435dc85bc9a1d01256f91071f2e9ee6 (diff) | |
| download | ninja-b2b1d24d6c5741f7cd6e920edfe8781aa9efce1b.tar.gz | |
Add some <li> to the copyright notice
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Conflicts:
license.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| -rw-r--r-- | license.html | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/license.html b/license.html index 6b94645e..a67ee3bb 100644 --- a/license.html +++ b/license.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility LLC. | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -31,46 +31,47 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 31 | </copyright> --> | 31 | </copyright> --> |
| 32 | <html> | 32 | <html> |
| 33 | 33 | ||
| 34 | <head lang="en"> | 34 | <head lang="en"> |
| 35 | <title>Ninja License</title> | 35 | <title>Ninja License</title> |
| 36 | |||
| 37 | <meta charset="utf-8"/> | ||
| 38 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> | ||
| 39 | <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" /> | ||
| 40 | <meta http-equiv="Pragma" content="no-store, no-cache" /> | ||
| 41 | <meta http-equiv="Expires" content="0" /> | ||
| 42 | |||
| 43 | <link rel="icon" href="images/favicon.png" sizes="16x16"> | ||
| 44 | |||
| 45 | <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> | ||
| 46 | |||
| 47 | <style type="text/css"> | ||
| 48 | 36 | ||
| 49 | html, body | 37 | <meta charset="utf-8"/> |
| 50 | { | 38 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> |
| 51 | width: 98%; | 39 | <meta http-equiv="cache-control" content="no-store, no-cache, must-revalidate" /> |
| 52 | height: 98%; | 40 | <meta http-equiv="Pragma" content="no-store, no-cache" /> |
| 53 | overflow: hidden; | 41 | <meta http-equiv="Expires" content="0" /> |
| 54 | background: white; | 42 | |
| 55 | margin: 0; | 43 | <link rel="icon" href="images/favicon.png" sizes="16x16"> |
| 56 | padding: 0; | 44 | |
| 45 | <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> | ||
| 46 | |||
| 47 | <style type="text/css"> | ||
| 48 | |||
| 49 | html, body { | ||
| 50 | width: 98%; | ||
| 51 | height: 98%; | ||
| 52 | overflow: hidden; | ||
| 53 | background: white; | ||
| 54 | padding: 0; | ||
| 57 | color: black; | 55 | color: black; |
| 58 | text-align: left; | 56 | text-align: left; |
| 59 | font-family: Arial; | 57 | font-family: Arial, Helvetica, sans-serif; |
| 60 | margin: 1%; | 58 | margin: 1%; |
| 61 | } | 59 | } |
| 62 | </style> | ||
| 63 | </head> | ||
| 64 | 60 | ||
| 65 | <body> | 61 | </style> |
| 62 | </head> | ||
| 63 | |||
| 64 | <body> | ||
| 66 | <h2>Ninja BSD License</h2> | 65 | <h2>Ninja BSD License</h2> |
| 67 | <h2>Copyright © 2012, Motorola Mobility LLC. All rights reserved.</h2> | 66 | <h2>Copyright © 2012, Motorola Mobility LLC. All rights reserved.</h2> |
| 68 | <p> | 67 | <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p> |
| 69 | Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br> | 68 | |
| 70 | * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.<br> | 69 | <ul> |
| 71 | * 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> | 70 | <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li> |
| 72 | * 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.<br> | 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> |
| 73 | </p> | 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 | |||
| 74 | <p> | 75 | <p> |
| 75 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br> | 76 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br> |
| 76 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br> | 77 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br> |
| @@ -84,5 +85,5 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 84 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br> | 85 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<br> |
| 85 | POSSIBILITY OF SUCH DAMAGE. | 86 | POSSIBILITY OF SUCH DAMAGE. |
| 86 | </p> | 87 | </p> |
| 87 | </body> | 88 | </body> |
| 88 | </html> | 89 | </html> |