]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bda29da 4557ec2)
Merge branch 'master' into Juhu/strafehud-fixes
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 1 Jul 2022 00:04:17 +0000 (02:04 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Fri, 1 Jul 2022 00:04:17 +0000 (02:04 +0200)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud/panel/strafehud.qc patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge
diff --cc qcsrc/client/hud/panel/strafehud.qc
Simple merge