summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2014-07-12 12:33:58 +0200
committerPale Moon <git-repo@palemoon.org>2014-07-12 12:33:58 +0200
commitf1cc7b7af99e962e53a18e854330b3b6589483e3 (patch)
tree727c64b363941e492f40c9672931c974c06d4d3d /LICENSE
parent8334a0be79fdba91af989e20037479f556e0590d (diff)
downloadpalemoon-gre-f1cc7b7af99e962e53a18e854330b3b6589483e3.tar.gz
License file update & clarification.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE13
1 files changed, 9 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 373395d73..dcfc1cf08 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,8 +2,13 @@ Please see the file toolkit/content/license.html for the copyright licensing
conditions attached to this codebase, including copies of the licenses
concerned.
-You are not granted rights or licenses to the trademarks of the
-Mozilla Foundation or any party, including without limitation the
-Firefox name or logo.
+For more information about source code licensing, see:
+http://www.mozilla.org/foundation/licensing.html
+
+You are not granted rights or licenses to the intellectual property or trademarks
+of the Mozilla Foundation, Moonchild productions, or any other party, including
+without limitation the Pale Moon name or logo.
+
+Binary versions of Pale Moon are subject to the Pale Moon redistribution license.
+For more information, see: http://www.palemoon.org/redist.shtml
-For more information, see: http://www.mozilla.org/foundation/licensing.html