]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/master2 martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 30 Nov 2019 22:02:35 +0000 (23:02 +0100)
commit65108bd794fde5ba269583ad8c7c770788b69f72
treeed27c266458e4a7a5216f616fa94fc203c75b777
parent4ca310a5cf62ea9f577659f523194d7da36a3f9c
parent9e32596bdae955be22e8a2021e5f4f67c235771e
Merge branch 'master' into martin-t/master2
qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc