diff options
| author | Valerio Virgillito | 2012-07-09 18:20:10 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 18:20:10 -0700 |
| commit | f83c329796eae9f11630b0d58d1b21d1ff71655a (patch) | |
| tree | 197f3a9739b2f8fcaee5d6d7968c2d29886bb2af | |
| parent | ac017fbb8a0489e650047780fab823962cb9da76 (diff) | |
| parent | 7c75cce8045acfc98fc074d4053c617421d917af (diff) | |
| download | ninja-f83c329796eae9f11630b0d58d1b21d1ff71655a.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
| -rw-r--r-- | credits.html | 2 | ||||
| -rw-r--r-- | license.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/credits.html b/credits.html index 91a20a3b..ad9c3418 100644 --- a/credits.html +++ b/credits.html | |||
| @@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 66 | </head> | 66 | </head> |
| 67 | 67 | ||
| 68 | <body> | 68 | <body> |
| 69 | <h2>Motorola Mobility LLC, Ninja Third Party Credits</h2> | 69 | <h2>Ninja Third Party Credits</h2> |
| 70 | <div> | 70 | <div> |
| 71 | Dotted stroke drawing from Gavin Kistner | 71 | Dotted stroke drawing from Gavin Kistner |
| 72 | <ul> | 72 | <ul> |
diff --git a/license.html b/license.html index 0a939b70..e900b16f 100644 --- a/license.html +++ b/license.html | |||
| @@ -62,7 +62,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 62 | </head> | 62 | </head> |
| 63 | 63 | ||
| 64 | <body> | 64 | <body> |
| 65 | <h2>Motorola Mobility LLC. Ninja BSD License</h2> | 65 | <h2>Ninja BSD License</h2> |
| 66 | <h2>Copyright © 2012, Motorola Mobility LLC. 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> | 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 | 68 | ||