]> 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: 7299b6f 1558591)
Merge branch 'master' into terencehill/player_sorting
authorterencehill <piuntn@gmail.com>
Sun, 16 Oct 2022 21:07:33 +0000 (23:07 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 16 Oct 2022 21:07:33 +0000 (23:07 +0200)
# Conflicts:
# .gitlab-ci.yml

1  2 
qcsrc/client/hud/panel/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/server/scores.qc patch | diff1 | diff2 | blob | history
qcsrc/server/scores_rules.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge
diff --cc qcsrc/server/scores.qc
Simple merge
diff --cc qcsrc/server/scores_rules.qc
Simple merge