From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Nov 2020 06:01:28 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3compat_sanity
X-Git-Tag: xonotic-v0.8.6~328^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bf2ddbf7560ca09c4529a4b243e9b34cf83232c;p=xonotic%2Fxonotic-data.pk3dir.git

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

6bf2ddbf7560ca09c4529a4b243e9b34cf83232c