X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=COPYING;h=bc269ef8da5dfaa380f1ba0f5f4116160936bbdd;hp=7bf6fe9d5db1f2babfd7ac95a3c149d1c52fcd27;hb=81086fbdb3c137d382cc9a9af3226a3b602a1cc7;hpb=35b8566aa67b6bb77e45aad62bec25d7cd235460

diff --git a/COPYING b/COPYING
index 7bf6fe9d..bc269ef8 100644
--- a/COPYING
+++ b/COPYING
@@ -14,13 +14,13 @@ This licensing document pertains to:
   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 as part of official Xonotic releases or Team Xonotic-owned
-branches, such as:
+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
+  thus not owned by Team Xonotic (these branches are usually prefixed with user
   name and a slash, as in "divVerent/")
 
 For status of such content, please contact its author.
@@ -30,11 +30,12 @@ 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.
+document are under the GPL version 3 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
-distributed under the GPL version 3 or any later version, at your choice.
+The source code of the game engine, DarkPlaces, is licensed under the GPL
+version 2 or any later version, at your choice. Furthermore, some source code
+inside the qcsrc/ directory may also be usable under other licenses as
+indicated by COPYING files therein.
 
 The two relevant licenses are provided in the files GPL-2 and GPL-3 in this
 package.
@@ -46,3 +47,20 @@ 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 applicable
+license as described above. 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.