Merge branch 'master' into Mario/duel
authorMario <mario@smbclan.net>
Sun, 30 Sep 2018 12:26:19 +0000 (22:26 +1000)
committerMario <mario@smbclan.net>
Sun, 30 Sep 2018 12:26:19 +0000 (22:26 +1000)
1  2 
gamemodes-server.cfg
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc

Simple merge
Simple merge
Simple merge