From: Mario <mario@smbclan.net>
Date: Sun, 21 Jul 2019 21:03:13 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9677a6f1dd8dbca207cf972f8cfa3ca6a8e4820e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

9677a6f1dd8dbca207cf972f8cfa3ca6a8e4820e