diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-16 16:35:05 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-16 16:35:05 +0200 |
| commit | 819ca50f163a9113772a7dbfd617d97151893337 (patch) | |
| tree | 24beff1b13d3c755e79a25af7386ea92860b1825 /browser | |
| parent | 000ac0cc833c415169ed7aa8c5e3493d0d4525fd (diff) | |
| download | UXP-819ca50f163a9113772a7dbfd617d97151893337.tar UXP-819ca50f163a9113772a7dbfd617d97151893337.tar.gz UXP-819ca50f163a9113772a7dbfd617d97151893337.tar.lz UXP-819ca50f163a9113772a7dbfd617d97151893337.tar.xz UXP-819ca50f163a9113772a7dbfd617d97151893337.zip | |
Clarify Basilisk branding/licensing (official/unofficial)
Diffstat (limited to 'browser')
| -rw-r--r-- | browser/LICENSE | 2 | ||||
| -rw-r--r-- | browser/branding/official/LICENSE | 16 | ||||
| -rw-r--r-- | browser/branding/unofficial/LICENSE | 9 |
3 files changed, 19 insertions, 8 deletions
diff --git a/browser/LICENSE b/browser/LICENSE index f1b2067a7..4f643a5c8 100644 --- a/browser/LICENSE +++ b/browser/LICENSE @@ -9,3 +9,5 @@ Basilisk name or logo. The Serpent logo in branding/unofficial is derived from "Sea Serpent" by Lorc, licensed under the Creative Commons license CC-BY 3.0 +For individual licensing restrictions on branding, see the LICENSE +files in the appropriate branding directories. diff --git a/browser/branding/official/LICENSE b/browser/branding/official/LICENSE index 32d55b9c7..8833fe212 100644 --- a/browser/branding/official/LICENSE +++ b/browser/branding/official/LICENSE @@ -1,10 +1,10 @@ -These files are under the MPL 2, as below. However, please note that you -are not granted any trademark rights or licenses to the trademarks of the -Mozilla Foundation or any party, including without limitation the -Firefox name or logo. +This location contains official branding for the Basilisk browser. -For more information, see: http://www.mozilla.org/foundation/licensing.html +Please note that you are not granted any trademark rights or licenses +to the trademarks of Moonchild Productions or any other party, +including without limitation the Basilisk name or logo. -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. +These branding materials are Copyrighted (c) M. Straver. All rights reserved. + +Official branding using these files is only allowed by the copyright holder +or by third parties with express permission from the copyright holder.
\ No newline at end of file diff --git a/browser/branding/unofficial/LICENSE b/browser/branding/unofficial/LICENSE new file mode 100644 index 000000000..35dec1819 --- /dev/null +++ b/browser/branding/unofficial/LICENSE @@ -0,0 +1,9 @@ +The Serpent application name and Serpent logo are licensed under a
+Creative Commons Attribution license.
+
+The Serpent logo is derived from "Sea Serpent" + by Lorc,
+licensed under the Creative Commons license CC-BY 3.0
+
+Branding files are created by M. Straver and similarly released
+under the Creative Commons license CC-BY 3.0
\ No newline at end of file |