]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitd2a588188f8e5c3cdcc716ddc08d521ee26b483f
tree09214542bc19bbba31a9a06606cfbc1095e8fbb7
parent7299b6f0c3aff0078d5279870bf14670ee320dcf
parent15585913a7e3eb6bd1ec6fce51c8dca0f61ce672
Merge branch 'master' into terencehill/player_sorting

# Conflicts:
# .gitlab-ci.yml
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/server/scores.qc
qcsrc/server/scores_rules.qc