From e60f34d2c2e966e16c523d8c5c886f5bdb32e1c8 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Sat, 22 Feb 2025 06:28:28 +1000 Subject: [PATCH] CONTRIBUTING: update licensing section --- CONTRIBUTING.md | 10 ++++++---- README.md | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e8bb88e..65ce8dc5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,13 +7,15 @@ Please let us know your GitLab username [on Matrix](https://xonotic.org/chat) so # Licensing -A condition for write (push) access and submission of merge requests is that **you agree that any code or data you push will be licensed under the [GNU General Public License, version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html), or any later version.** +A condition for write (push) access and submission of merge requests is that **you agree that any code or other data you push will be licensed under the [GNU General Public License, version 3](https://www.gnu.org/licenses/gpl-3.0.html), or any later version.** -If the directory or repository your changes apply to contains a LICENSE or COPYING file indicating another license or a dual license, then **you agree that your pushed code will be licensed as specified in that file.** Examples of subdirectories and repositories with a dual license or a different license: -* [xonotic-data.pk3dir/qcsrc/lib/warpzone](https://gitlab.com/xonotic/xonotic-data.pk3dir/-/tree/master/qcsrc/lib/warpzone) - dual licensed with GNU GPLv2 (or any later version), or MIT license. +**Exceptions:** if the directory or repository your changes apply to contains a LICENSE or COPYING file indicating another license or a dual license, then **you agree that your pushed code or other data will be licensed as specified in that file.** Examples of subdirectories and repositories with a dual license or a different license: +* [xonotic-data.pk3dir/qcsrc/lib/warpzone](https://gitlab.com/xonotic/xonotic-data.pk3dir/-/tree/master/qcsrc/lib/warpzone) - dual-licensed with GNU GPLv2 (or any later version), or MIT license. * [xonstat-go](https://gitlab.com/xonotic/xonstat-go/) - licensed with [GNU AGPLv3](https://www.gnu.org/licenses/agpl-3.0.html) -In case the code you pushed was not written by you, it is your responsibility to ensure proper licensing. +In case the code or other data you pushed was not created by you, it is your responsibility to ensure proper licensing. + +See also the primary licensing document [COPYING](COPYING) # Technical diff --git a/README.md b/README.md index fa6dd743..aafa1653 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Xonotic is an addictive, arena-style first person shooter with crisp movement an ## License -Xonotic is and will always be free and open source. It is available under the [copyleft](https://www.gnu.org/copyleft/)-style [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) license (see the [COPYING](COPYING) file for details). +Xonotic is and will always be free and open source. It is available under the [copyleft](https://www.gnu.org/copyleft/)-style [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.html) license (see the [COPYING](COPYING) and [CONTRIBUTING](CONTRIBUTING.md#licensing) files for full details). ## Download -- 2.39.5