]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9599b09 0d0bdb2)
Merge branch 'master' into drjaska/morosophos/server-current4
authordrjaska <drjaska83@gmail.com>
Mon, 1 Jul 2024 06:58:50 +0000 (09:58 +0300)
committerdrjaska <drjaska83@gmail.com>
Mon, 1 Jul 2024 06:58:50 +0000 (09:58 +0300)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud/panel/strafehud.qc patch | diff1 | diff2 | blob | history

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