From: bones_was_here <bones_was_here@xonotic.au>
Date: Wed, 12 Oct 2022 07:38:38 +0000 (+0000)
Subject: Merge branch 'Mario/q3compat_sanity' into 'master'
X-Git-Tag: xonotic-v0.8.6~328
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d514cf3f918bb21219cb877480b3bab628bfacd8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/q3compat_sanity' into 'master'

Merge branch Mario/q3compat_sanity (M merge request)

Closes #2281

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

d514cf3f918bb21219cb877480b3bab628bfacd8