Merge branch 'Mario/ctf_colormaps' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 10 Aug 2022 12:56:16 +0000 (12:56 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 10 Aug 2022 12:56:16 +0000 (12:56 +0000)
Merge branch Mario/ctf_colormaps (S merge request)

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


Trivial merge