From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Sun, 9 Aug 2020 13:38:03 +0000 (+1000)
Subject: Merge branch 'master' into bones_was_here/q3compat
X-Git-Tag: xonotic-v0.8.5~352^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f1c4b91123dadbb637d88ce278c6b3f001a475c;p=xonotic%2Fxonotic-data.pk3dir.git

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

3f1c4b91123dadbb637d88ce278c6b3f001a475c