Merge branch 'master' into Mario/duel
authorMario <mario@smbclan.net>
Sat, 29 Sep 2018 13:59:52 +0000 (23:59 +1000)
committerMario <mario@smbclan.net>
Sat, 29 Sep 2018 13:59:52 +0000 (23:59 +1000)
commit66d5ee9a0aea47839f244cf5346196c1c66cb490
tree0b13acaac0c6a15440c3cd735d34d91349490ffe
parent233228cc89400ba7d27aaa588116f3e30dad5e69
parent00d7a93f67cca196b2781899d5510b6aaf9816d7
Merge branch 'master' into Mario/duel
qcsrc/common/mapinfo.qh
qcsrc/server/client.qc
qcsrc/server/client.qh