]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 12 Jun 2023 17:35:53 +0000 (17:35 +0000)
commit9595bebf1c0c7e132d57e21d56b85673dd823538
tree41a4b3602388432063e637481c4bf00ed0fda58a
parentf2955b1bcdb1146d5441a76d60471a7fdc34acca
parentc803c56bef7e7973811b46c715805530e82d40d2
Merge branch 'drjaska/terencehill/survival_scoreboard_colors_fix' into 'master'

Simpler implementation of !1200 and fixes to !1195

Closes #2844

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