Merge branch 'master' into Mario/gametypes
authorMario <mario.mario@y7mail.com>
Wed, 15 Jul 2020 12:10:27 +0000 (22:10 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 15 Jul 2020 12:10:27 +0000 (22:10 +1000)
commite12b0503854a3db83f9ddcda6285b6c343c0741a
tree8866f782ba14d8e500f63e586b4333248e1974b7
parent1d2d6b2b5e13b035f40dbaf4f197f82aceccde52
parente5a2cbaa9e68e0ab3d018d9fc4b802061436091b
Merge branch 'master' into Mario/gametypes
qcsrc/common/mapinfo.qc
qcsrc/server/compat/quake3.qc