]> 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: 795f0b9 9ff9346)
Merge branch 'master' into Juhu/strafehud-fixes
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 17 Mar 2021 23:48:34 +0000 (00:48 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Wed, 17 Mar 2021 23:48:34 +0000 (00:48 +0100)
1  2 
qcsrc/client/hud/panel/strafehud.qc patch | diff1 | diff2 | blob | history

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