RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-03 01:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

CONTRIBUTING: update licensing section

Browse Source
This commit is contained in:
bones_was_here 2025-02-22 06:28:28 +10:00
parent b104167f6a
commit e60f34d2c2
No known key found for this signature in database
GPG Key ID: 982FE90EDA930528
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONTRIBUTING.md
View File

@ -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

2
README.md
View File

@ -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