]> 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>
Sun, 12 Jan 2025 02:48:35 +0000 (03:48 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sun, 12 Jan 2025 02:48:35 +0000 (03:48 +0100)
commitae16a18b36c8cdac4603ffaf2f1ead056c83107c
tree5723d73653a3875595c3380a149068139b9017c9
parentf2e0d5e49e075863fcba25c5c7946be054d0532e
parent9a72c2dc9daea548f511517ba064332b19c13c85
Merge branch 'master' into Juhu/strafehud-next

Fixed merge conflicts caused by CVAR description and strafehud logic changes
_hud_common.cfg
qcsrc/client/hud/panel/strafehud/util.qc