]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Juhu/strafehud-server
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Tue, 28 Mar 2023 21:11:37 +0000 (23:11 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Tue, 28 Mar 2023 21:12:07 +0000 (23:12 +0200)
commit3ef7c9598fa9bba51a7fda8eca1b7e2f823bd5be
tree05f44add9d0c93e739b25a9adaa00d43fe709918
parentb1c5a9b5c4a5e720f48282608a03c06947acb288
parent8411e8405dcb67853bc15a238932becc1aee66a9
Merge branch 'master' into Juhu/strafehud-server

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