]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/survival
authorMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 08:06:40 +0000 (18:06 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 18 Jul 2020 08:06:40 +0000 (18:06 +1000)
commit0954810d77ef0295dca4959eb6cdd6bbbcfd800f
treee8610f247c672cf6c142607662c04038ced4abe7
parent7be97e21d37a76bdc564dab9a32baeab9e43b191
parent4efe03bff28c2a206565f259ee08288c7846fc6e
Merge branch 'master' into Mario/survival
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/gamemodes/gamemode/survival/cl_survival.qh
qcsrc/common/gamemodes/gamemode/survival/survival.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc