From: Mario <mario.mario@y7mail.com>
Date: Sun, 15 Sep 2019 06:20:02 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_camstuff
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36b1e07cbd318b9ef5262fb5951244f16ef297c8;p=xonotic%2Fxonotic-data.pk3dir.git

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

36b1e07cbd318b9ef5262fb5951244f16ef297c8