]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/Juhu/scoreboard-strafe' into morosophos/server...
authorNick S <nick@teichisma.info>
Tue, 17 Jan 2023 21:15:18 +0000 (23:15 +0200)
committerNick S <nick@teichisma.info>
Tue, 17 Jan 2023 21:15:18 +0000 (23:15 +0200)
1  2 
_hud_common.cfg
qcsrc/common/constants.qh
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/server/command/sv_cmd.qc

diff --cc _hud_common.cfg
Simple merge
Simple merge
Simple merge