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)
commit93d199789e02f894ce801e815810d706d909a93d
tree27faa5c0f76814fd9ee40df172bca7268958f315
parent164d3e92e91b91d8f6960ee6442f4906dffb418d
parentc85cc819d541ebcb396263ec5228399a9a4d788c
Merge branch 'master' into terencehill/bot_ai
xonotic-server.cfg