]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/weapon-priority
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Oct 2019 10:36:52 +0000 (12:36 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Oct 2019 10:36:52 +0000 (12:36 +0200)
commitab14b9fb45a2400ecea26c3a929a0f6ec034b703
tree6fb31405aebb6b0d7afc56599f04643fb2dafb0d
parent569c6832aba01cc2c0b89cf7101ea6d8317f1eb9
parent1d81a2ae5ceb65ecc434cb3b8f6f3176da4889f3
Merge branch 'master' into martin-t/weapon-priority
xonotic-client.cfg