From: terencehill Date: Mon, 8 Jun 2020 18:30:41 +0000 (+0200) Subject: Merge branch 'master' into terencehill/glowmod_color_fix X-Git-Tag: xonotic-v0.8.5~7^2~13^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ed0476492d5f4029cc36ac164d452591771ef8a;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/glowmod_color_fix --- 9ed0476492d5f4029cc36ac164d452591771ef8a