Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Fri, 18 May 2018 10:54:28 +0000 (12:54 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 18 May 2018 10:54:28 +0000 (12:54 +0200)
1  2 
xonotic-server.cfg

Simple merge