]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/new_shotgun_tracing
authorSamual <samual@xonotic.org>
Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
committerSamual <samual@xonotic.org>
Fri, 23 Sep 2011 05:59:15 +0000 (01:59 -0400)
commitf402c923b7fb5a473ce13bf00451785853f4549e
tree72043ee06438c644e133233d362ff63dfcc6b8c0
parentd0e90eaedd6742088105adb1e0e0c5f954936d15
parent51650d328de48c611eec30ebf60ad3b152a409c9
Merge remote branch 'origin/master' into samual/new_shotgun_tracing
balance25.cfg
balanceFruit.cfg
balanceLeeStricklin.cfg
balanceXonotic.cfg
balancetZork.cfg
qcsrc/server/autocvars.qh