From: Mario <mario.mario@y7mail.com>
Date: Tue, 31 Dec 2019 15:15:12 +0000 (+0000)
Subject: Merge branch 'Mario/qc_camstuff' into 'master'
X-Git-Tag: xonotic-v0.8.5~1105^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fffb95930c167169581801f3e46728ebb0131ec2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/qc_camstuff' into 'master'

Merge branch Mario/qc_camstuff (M merge request)

See merge request xonotic/xonotic-data.pk3dir!719
---

fffb95930c167169581801f3e46728ebb0131ec2