]> 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: 6c90374 3ef7c95)
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 30 Mar 2023 18:45:43 +0000 (21:45 +0300)
committerNick S <nick@teichisma.info>
Thu, 30 Mar 2023 18:45:43 +0000 (21:45 +0300)
1  2 
qcsrc/client/hud/panel/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/common/weapons/weapon/crylink.qc patch | diff1 | diff2 | blob | history
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge
diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge