X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=COPYING;h=d4b8d0dc81b2b5152393bb15fc44c807b7081b76;hp=018a918462b95cd1e9f3e682a2b9bee75476f8d9;hb=034f34b377e371efd97a331c75fd492e88dd86b5;hpb=412387f19884fbd1de194ece29fd9ae8d46479be

diff --git a/COPYING b/COPYING
index 018a9184..d4b8d0dc 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,36 @@
 Xonotic Licensing
 =================
 
-All source files are under the GPL version 2 or any later version, at your
-choice.
+
+Scope
+-----
+
+This licensing document pertains to:
+
+- Official Xonotic releases
+
+- The Team Xonotic-owned branches (i.e. those whose name does not contain a
+  slash, like "master" and "div0-stable") of the repositories on
+  git://git.xonotic.org/xonotic/ including all their ancestor commits
+
+Team Xonotic does not make any guarantees for licensing or legal status of any
+content not distributed as part of official Xonotic releases or Team
+Xonotic-owned branches, such as:
+
+- Files downloaded from a web server by Xonotic (e.g. automatic map downloads)
+
+- Branches of our repository that are owned by a user of the repository, and
+  thus not owned by Team Xonotic (these branches are always prefixed with user
+  name and a slash, as in "divVerent/")
+
+For status of such content, please contact its author.
+
+
+Licensing Grant
+---------------
+
+All source files (as defined by the respective license) in scope of this
+document are under the GPL version 2 or any later version, at your choice.
 
 Linux and Windows binaries however link to a library that is under the LGPL
 version 3 with the "or any later version" clause. Thus, they can only be
@@ -10,3 +38,29 @@ distributed under the GPL version 3 or any later version, at your choice.
 
 The two relevant licenses are provided in the files GPL-2 and GPL-3 in this
 package.
+
+
+Source Code Download
+--------------------
+
+Current and past Xonotic source, including tagged commits containing source
+matching any official Xonotic release, is available on
+git://git.xonotic.org/xonotic/
+
+
+Contributions
+-------------
+
+By committing data/files, you agree to license all the changes/additions
+contained in your commits to Team Xonotic under the terms of the General Public
+License version 2, with the "any later version" clause active. In particular,
+you guarantee that you have acquired all the necessary rights from possible
+other copyright holders to be able to license your work under this license. Any
+submission which does not fulfill this condition may lead to legal action
+against the submitter.
+
+Exceptions however may be made on request, but in any case, Team Xonotic must
+be allowed to distribute the changes as part of the git repository, and others
+must be allowed to redistribute it in form of cloned git repositories. As
+stated above, no guarantees are made by Team Xonotic about licensing status of
+such branches.