From: Mario <mario@smbclan.net>
Date: Wed, 28 Aug 2019 10:27:11 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_camstuff
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d0df5ac293f4d6c163a663bdd215a9f06e257fc;p=xonotic%2Fxonotic-data.pk3dir.git

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

7d0df5ac293f4d6c163a663bdd215a9f06e257fc