From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 7 Sep 2011 13:36:16 +0000 (+0200)
Subject: disclaim ownership of user generated content
X-Git-Tag: xonotic-v0.6.0~108
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=35b8566aa67b6bb77e45aad62bec25d7cd235460;hp=5b4307c6a17aac239095030c527fbc76f1a0cf23

disclaim ownership of user generated content
---

diff --git a/COPYING b/COPYING
index 018a9184..7bf6fe9d 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 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,11 @@ 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/