]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 1 Jul 2018 03:37:53 +0000 (05:37 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 1 Jul 2018 03:37:53 +0000 (05:37 +0200)
commit1c75473d8e67534114d6fd289d708773ade486e0
tree514a0003930c6dd70b464bfde5b565c2ae0474ee
parent1ef4dce058b47444be3763368a84c37b2117644c
parent27b2ff0cae842e8eec6d9198d517a817b495d67e
Merge branch 'master' into martin-t/master
balance-mario.cfg
balance-overkill.cfg
balance-xdf.cfg
qcsrc/server/g_damage.qc
qcsrc/server/weapons/tracing.qc