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)
commit8b7d07cc724c130cb61a8b32099b01b26a418149
treedd80ec21b15a3c6475401efe470db0efc54465f1
parent28e15b0c98e4fabee5de164dd09d331335fa3038
parent30626ce6c5cf206210781441d1af567b2bea0e4d
Merge branch 'master' into terencehill/bot_ai
qcsrc/server/bot/default/bot.qc
xonotic-server.cfg