]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/cfg_fixes
authorterencehill <piuntn@gmail.com>
Thu, 25 Jul 2024 21:41:39 +0000 (23:41 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 25 Jul 2024 21:41:39 +0000 (23:41 +0200)
commit0b1c59e2e6e133fc87e2363511b379d7ca6c740e
tree70366fc136fc0cb67f9395fa2503764b3cde73a0
parente4f917aea1ae85e28bb8ae7733fdad5cc943f01c
parent6046ba734ca103327860714b19bad78951dd2549
Merge branch 'master' into terencehill/cfg_fixes
xonotic-client.cfg
xonotic-common.cfg