From: terencehill <piuntn@gmail.com>
Date: Sat, 8 Dec 2018 12:12:33 +0000 (+0100)
Subject: Merge branch 'terencehill/bot_ai' into 'master'
X-Git-Tag: xonotic-v0.8.5~1705
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=74bd72dcc526c505735c626597a0c14eac52e5d6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_ai' into 'master'
---

74bd72dcc526c505735c626597a0c14eac52e5d6