]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/scoreboard-strafe Juhu/scoreboard-strafe
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 22 Jun 2023 01:47:43 +0000 (03:47 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 22 Jun 2023 01:47:43 +0000 (03:47 +0200)
commit4b4275337995717170343fe0b979303b58e29b57
tree578893e8bd2d85763034cad861969799039d06dc
parente34dc654ebfaab972925df7d412e57063ad8b700
parentc2c16160d15c51e7e355c096998a06cb6537c292
Merge branch 'master' into Juhu/scoreboard-strafe

Fixed merge conflict caused by new SCO_LABEL macro
.gitlab-ci.yml
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/scores.qh