]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/strafehud-fixes
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Mon, 27 Mar 2023 15:55:29 +0000 (17:55 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Mon, 27 Mar 2023 15:58:45 +0000 (17:58 +0200)
commit51e4f798abb1fc968f37d1ad425eaf5871bb33de
treef46a261ee6e91f1bdef147a40df09928c0a25dad
parentf5bd24b823c517378c360525c4e7b363ef80af7d
parentf9c14287d0f6e371b9eba340b1105d47a560bcc8
Merge branch 'master' into Juhu/strafehud-fixes

Fixed merge conflict caused by the new speed unit cvar
_hud_common.cfg
qcsrc/client/hud/panel/strafehud.qc
qcsrc/client/hud/panel/strafehud.qh