From: terencehill <piuntn@gmail.com>
Date: Sat, 2 May 2020 20:45:23 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/erebus_tweaks
X-Git-Tag: xonotic-v0.8.5~1030^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73295fdedbff00283c27cd8d96c1074606374e0f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/erebus_tweaks
---

73295fdedbff00283c27cd8d96c1074606374e0f