From: terencehill Date: Sat, 12 Dec 2020 16:58:08 +0000 (+0100) Subject: Merge branch 'master' into terencehill/glowmod_color_fix X-Git-Tag: xonotic-v0.8.5~7^2~13^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=74ab018d9c0857ea241cae2c8ac8b2d64bcbc332;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/glowmod_color_fix --- 74ab018d9c0857ea241cae2c8ac8b2d64bcbc332