]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2955b1 c803c56)
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)
Simpler implementation of !1200 and fixes to !1195

Closes #2844

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


Trivial merge