]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch master into Juhu/strafehud-server
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sun, 18 Jul 2021 18:02:26 +0000 (20:02 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sun, 18 Jul 2021 18:02:40 +0000 (20:02 +0200)
commit48a13dc978eab5de3cb5202c8ae54be527ba3c12
tree28d0abcf8a4c55b715540f1885634e0a565e4a27
parentf28410cfd91ae4c11a80ed955efb21c040f2849c
parent2adb97ad5906634c812f5d1454ba9b01831f3f1d
Merge branch master into Juhu/strafehud-server
Fix merge conflict caused by GetSpeedUnit call optimization in master
_hud_common.cfg
qcsrc/client/hud/panel/strafehud.qc