]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Mon, 19 Oct 2020 10:26:37 +0000 (20:26 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 19 Oct 2020 10:26:37 +0000 (20:26 +1000)
commit81467012350e937ca30699bfcefc75727ec6e39f
treef162a2c11e25749d117f932bd8b4ace4b8118ebf
parentda3c5d76b2c51a0813740b0b08bd8fe0edc05148
parentb9fff06113ba543868354f87ee259be529f04740
Merge branch 'master' into Mario/team_keepaway
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/tka/cl_tka.qc
qcsrc/common/gamemodes/gamemode/tka/tka.qh
qcsrc/common/stats.qh
qcsrc/server/world.qc