From: Mario <mario@smbclan.net>
Date: Sat, 16 Mar 2019 10:03:49 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_camstuff
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f785b8a76c2336cb00e78fe9e738d55512a086f5;p=xonotic%2Fxonotic-data.pk3dir.git

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

f785b8a76c2336cb00e78fe9e738d55512a086f5