]> 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: 6afdf61 1a9850f)
Merge branch 'terencehill/entcs_fixes' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 27 Feb 2021 11:35:33 +0000 (11:35 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 27 Feb 2021 11:35:33 +0000 (11:35 +0000)
entcs and shownames fixes

See merge request xonotic/xonotic-data.pk3dir!873

1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge