]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Merge branch 'terencehill/intermission_restart_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 25 Feb 2024 09:55:47 +0000 (09:55 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 25 Feb 2024 09:55:47 +0000 (09:55 +0000)
commit073f7cf07c487df5b71c17f13fc152f21573ae5a
tree7f48fc1923744bd72ae73c068e49ac98f735a06a
parent4147e49101bbbb2d9215dd065121b84a51df1167
parent3f9164cc1164dd28f232d125e4e03973bbbf7244
Merge branch 'terencehill/intermission_restart_fix' into 'master'

Fix restart applying different gametype if called after gametype vote

See merge request xonotic/xonotic-data.pk3dir!1256
qcsrc/server/mapvoting.qc
qcsrc/server/mapvoting.qh