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)
commit07bbfa46e816c94bd63a2af533c4a2a31e0078a5
tree45cb4ddc4ce936be32272454218c01077cf4e8af
parent0db0001bd383b6d57f9583120d0868feb70290e7
parent97ee1090c757e533b037f57a302a83a0e05dd39d
Merge branch 'Mario/ctf_colormaps' into 'master'

Merge branch Mario/ctf_colormaps (S merge request)

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