]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/lms_updates
authorterencehill <piuntn@gmail.com>
Mon, 13 Sep 2021 21:58:36 +0000 (23:58 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 13 Sep 2021 21:58:36 +0000 (23:58 +0200)
commitd0723d5dc8d2e92262cfe895b9dbfb4241c68d9c
tree68654bf75bc7d5104eb83c60c9dc654c00499088
parent9e1288f65383521366415f072e827ad5e305fef6
parent318ea8d365de054a026d6de285a7a852cfdb9693
Merge branch 'master' into terencehill/lms_updates

# Conflicts:
# qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc