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

Merge branch 'master' into terencehill/bot_ai

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
---

4096ab0591cbd7fac803e022375cd3c221511d8b