From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 1 Sep 2019 14:03:14 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/AMMO
X-Git-Tag: xonotic-v0.8.5~1274^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=629f6f3b55e891281bb265f8022d129d313c110f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/AMMO
---

629f6f3b55e891281bb265f8022d129d313c110f