From: terencehill <piuntn@gmail.com>
Date: Fri, 8 Mar 2019 16:55:20 +0000 (+0100)
Subject: Merge branch 'terencehill/bot_ai'
X-Git-Tag: xonotic-v0.8.5~1586
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=307166f4a88c095e499ec172390ae4ebe2656023;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_ai'
---

307166f4a88c095e499ec172390ae4ebe2656023