From: bones_was_here <bones_was_here@xa.org.au>
Date: Wed, 30 Sep 2020 17:20:40 +0000 (+1000)
Subject: Merge branch 'master' into bones_was_here/q3compat
X-Git-Tag: xonotic-v0.8.5~352^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=837c32688ad1f1548e7d4cf4339691181c2bb6ff;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into bones_was_here/q3compat
---

837c32688ad1f1548e7d4cf4339691181c2bb6ff