]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/strafehud-next
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 28 Nov 2024 19:02:08 +0000 (20:02 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 28 Nov 2024 19:02:35 +0000 (20:02 +0100)
commit5b11393601dcff0ace0dfb8bcabcb06bd63b9b01
treea20c2d9afe7d300ad0bb30aaeaaa98b4d9c06e3b
parent311c1fa7270b912cfdf809cb2e8fbee3cff0e3b0
parent6fbc1f63cb2e298b8e4aa425a891259abbdbda14
Merge branch 'master' into Juhu/strafehud-next

Fixed merge conflict caused by the new networked checkpoint speed
_hud_common.cfg
qcsrc/client/hud/panel/_mod.inc
qcsrc/client/hud/panel/_mod.qh
qcsrc/client/hud/panel/strafehud/extra.qc