From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Fri, 10 Jul 2020 15:55:47 +0000 (+1000)
Subject: Merge branch 'master' into bones_was_here/q3compat
X-Git-Tag: xonotic-v0.8.5~352^2~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e913f30e59a86bbac9e0c09dd5774260c7f1c7f2;p=xonotic%2Fxonotic-data.pk3dir.git

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

e913f30e59a86bbac9e0c09dd5774260c7f1c7f2