From: Mario <mario.mario@y7mail.com>
Date: Mon, 30 Sep 2019 14:07:37 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_camstuff
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37b3d02a3583ada75dd373d067a8ab6a0ce109a1;p=xonotic%2Fxonotic-data.pk3dir.git

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

37b3d02a3583ada75dd373d067a8ab6a0ce109a1