Merge branch 'master' into terencehill/bot_ai 776/head
authorterencehill <piuntn@gmail.com>
Sun, 29 Mar 2020 15:13:36 +0000 (17:13 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 29 Mar 2020 15:13:36 +0000 (17:13 +0200)
1  2 
qcsrc/server/bot/default/bot.qc
xonotic-server.cfg

Simple merge
Simple merge