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)
commit164d3e92e91b91d8f6960ee6442f4906dffb418d
treecb14e2b05274da75a13c9ed8698d641e85f3568f
parent63007acbcf89ce3e9da266171890dfae5be88dea
parentbfa6affbe835a3cd8ab5937db891a72542eebd3a
Merge branch 'master' into terencehill/bot_ai
xonotic-server.cfg