From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Mon, 20 Jul 2020 08:38:21 +0000 (+1000)
Subject: Merge branch 'master' into bones_was_here/q3compat
X-Git-Tag: xonotic-v0.8.5~352^2~61
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=ff2e9a518b256c1cbaad9bc3eb7450f85ca8b80e;p=xonotic%2Fxonotic-data.pk3dir.git

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

ff2e9a518b256c1cbaad9bc3eb7450f85ca8b80e