]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Feb 2018 15:26:43 +0000 (16:26 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Feb 2018 15:26:43 +0000 (16:26 +0100)
commit19ad7dc5d62acfd72f90f9bafafa07e8f6efccb7
tree6423f7c35065da9fdbea0726e043f08bf0a5ff2b
parent84f0ef2e09d581da11433fa029cc9b44f4b58092
parent45881fb1af30037591879eb93c5eea370255921c
Merge branch 'master' into martin-t/okc3
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
qcsrc/server/g_damage.qc