From: terencehill <piuntn@gmail.com>
Date: Mon, 2 Jul 2018 14:00:01 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dde75a49c8c781947c6d5ef5968bb78f24171e25;p=xonotic%2Fxonotic-data.pk3dir.git

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

dde75a49c8c781947c6d5ef5968bb78f24171e25