]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:11:58 +0000 (21:11 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:11:58 +0000 (21:11 +1000)
commitc852e31fd6939a4d906d1a6ab5b054867a9a00a3
treecb9657fa6041c7b984115874ddabc997b3ff73ef
parent6c9238ad8aaf48ab28624d27c2e8fb881bd39043
parent09af183261cd902191150d197c3411292b45ab77
Merge branch 'master' into Mario/team_keepaway
qcsrc/common/mapinfo.qh
qcsrc/common/scores.qh
qcsrc/server/g_world.qc