]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 09:49:11 +0000 (19:49 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 09:49:11 +0000 (19:49 +1000)
commitda3c5d76b2c51a0813740b0b08bd8fe0edc05148
treeae9936ed101fa7590d747a651f847e989eebc39f
parentc852e31fd6939a4d906d1a6ab5b054867a9a00a3
parent201c74e481db7b85a9a9b198da9fd00b4a4092a4
Merge branch 'master' into Mario/team_keepaway
qcsrc/common/mapinfo.qh
qcsrc/common/stats.qh
qcsrc/server/g_world.qc