Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Mon, 4 Jun 2018 18:12:40 +0000 (20:12 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 4 Jun 2018 18:12:40 +0000 (20:12 +0200)
1  2 
qcsrc/server/bot/default/aim.qc
qcsrc/server/bot/default/navigation.qc
xonotic-server.cfg

Simple merge
Simple merge