]> 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: 0a3226a c2a1ed1)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Fri, 7 Oct 2022 10:01:49 +0000 (13:01 +0300)
committerNick S <nick@teichisma.info>
Fri, 7 Oct 2022 10:01:49 +0000 (13:01 +0300)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud/panel/scoreboard.qc patch | diff1 | diff2 | blob | history

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