Merge branch 'master' into Mario/duel
authorMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 01:57:08 +0000 (11:57 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 01:57:08 +0000 (11:57 +1000)
commit8e5d376c49510049572c7c182ba8778c8a8f80dd
treeee47c32f70db64c287cd5fba74b4c65ba4953c26
parent1da9577d75cb298a80a5944040148431a8c89894
parentbb6e4e97897e547031eb711018bf4d46e3ec280b
Merge branch 'master' into Mario/duel
qcsrc/common/mapinfo.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc