]> 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: 28bb672 c2c1616)
Merge branch 'master' into Juhu/strafehud-next_cvarsave
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 22 Jun 2023 01:04:46 +0000 (03:04 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 22 Jun 2023 01:04:46 +0000 (03:04 +0200)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge