]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/survival
authorMario <mario.mario@y7mail.com>
Thu, 17 Nov 2022 08:18:36 +0000 (18:18 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 17 Nov 2022 08:18:36 +0000 (18:18 +1000)
commit61fe092d7042eb1bf8aa8b4e35a807775ae7803a
tree1269c438e4d03187b70ea8a3a8598670cfa81640
parent336c5683fef7d9f3501c7396e5bcc30cf28fc75b
parent7f1e6e3379dd4bf462ec46b197edfd01250d6f4b
Merge branch 'master' into Mario/survival
gamemodes-server.cfg
qcsrc/common/ent_cs.qc
qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc
qcsrc/common/scores.qh