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)
commit23a3837422cea42aa657984500da071b31bda24c
treeb4cdc2f5bab29e418506854af959245cac7045dd
parentc7ba2dd9bd814560a443fe6cc6f3a0575ef55476
parentccc4cc78914bababed38e4902d4d8ce63c7ca6ce
Merge branch 'master' into Mario/duel
gamemodes-server.cfg
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc