]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge upstream
authorMorosophos <morosophos@teichisma.info>
Mon, 12 Oct 2020 07:32:14 +0000 (10:32 +0300)
committerMorosophos <morosophos@teichisma.info>
Mon, 12 Oct 2020 07:32:14 +0000 (10:32 +0300)
1  2 
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/server/race.qc

Simple merge