Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Sun, 29 Apr 2018 11:19:30 +0000 (13:19 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 29 Apr 2018 11:19:30 +0000 (13:19 +0200)
1  2 
xonotic-server.cfg

Simple merge