From: Mario <mario.mario@y7mail.com>
Date: Wed, 18 Sep 2019 21:59:20 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_camstuff
X-Git-Tag: xonotic-v0.8.5~1105^2~59^2~2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=1e89126217e714676072609a730644f74729b3ce;p=xonotic%2Fxonotic-data.pk3dir.git

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

1e89126217e714676072609a730644f74729b3ce