]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Thu, 5 May 2022 12:06:25 +0000 (22:06 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 5 May 2022 12:06:25 +0000 (22:06 +1000)
1  2 
gamemodes-server.cfg
qcsrc/common/scores.qh
qcsrc/common/stats.qh
qcsrc/server/world.qc

Simple merge
Simple merge
Simple merge
Simple merge