]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Thu, 30 Jun 2022 13:26:14 +0000 (23:26 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 30 Jun 2022 13:26:14 +0000 (23:26 +1000)
commit2d03f0e82d6abd0d19c68b8b4d239f24d5417651
tree01f3964bc171e9c9f8f8a5a1a8971a67a0ac760c
parentae682b87f4511d6e0bafa9b67ae463f9d9dad877
parent4557ec2fa262ad06d963f34437cc25db91b85120
Merge branch 'master' into Mario/team_keepaway
gamemodes-client.cfg
gamemodes-server.cfg
qcsrc/menu/xonotic/util.qc
qcsrc/server/world.qc