From: terencehill <piuntn@gmail.com>
Date: Wed, 10 Aug 2022 12:56:16 +0000 (+0000)
Subject: Merge branch 'Mario/ctf_colormaps' into 'master'
X-Git-Tag: xonotic-v0.8.6~390
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=07bbfa46e816c94bd63a2af533c4a2a31e0078a5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ctf_colormaps' into 'master'

Merge branch Mario/ctf_colormaps (S merge request)

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

07bbfa46e816c94bd63a2af533c4a2a31e0078a5