diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /application/basilisk/branding/official/LICENSE | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'application/basilisk/branding/official/LICENSE')
| -rw-r--r-- | application/basilisk/branding/official/LICENSE | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/application/basilisk/branding/official/LICENSE b/application/basilisk/branding/official/LICENSE new file mode 100644 index 000000000..8833fe212 --- /dev/null +++ b/application/basilisk/branding/official/LICENSE @@ -0,0 +1,10 @@ +This location contains official branding for the Basilisk browser. + +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. + +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 |