]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Merge branch master into Juhu/strafehud-fixes
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sun, 18 Jul 2021 17:41:33 +0000 (19:41 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sun, 18 Jul 2021 17:41:33 +0000 (19:41 +0200)
commitf2d9bf21e6975a88883a287236427f9e485bea34
tree30abe02cdf82b44ad89f1ed01486ad28f72ac343
parent91d1b3bab0c63e613981e7836d87ec97a0a9d2de
parent2adb97ad5906634c812f5d1454ba9b01831f3f1d
Merge branch master into Juhu/strafehud-fixes
Fix merge conflict caused by GetSpeedUnit call optimization in master
_hud_common.cfg
qcsrc/client/hud/panel/strafehud.qc