diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
| commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
| tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /browser/branding/official/LICENSE | |
| parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
| parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
| download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'browser/branding/official/LICENSE')
| -rw-r--r-- | browser/branding/official/LICENSE | 16 |
1 files changed, 8 insertions, 8 deletions
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 |