Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Mon, 2 Jul 2018 14:00:01 +0000 (16:00 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 2 Jul 2018 14:00:01 +0000 (16:00 +0200)
1  2 
qcsrc/common/gamemodes/gamemode/assault/assault.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
xonotic-server.cfg

Simple merge
Simple merge