]> 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>
Mon, 26 Sep 2011 16:37:26 +0000 (12:37 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:37:26 +0000 (12:37 -0400)
commit7d26e546fdd2a816edae2e3347267f39026e7fbe
tree9cb5ac0305243ad2bdfe20ec2fb564e31fa0c29d
parent7deb89dcfcb8525d36a014e1dc2e364fb67e7506
parenta084941bf63f7b642b99eb5845e3020792a58501
Merge remote branch 'origin/master' into samual/new_shotgun_tracing
balance25.cfg
balanceFruit.cfg
balanceLeeStricklin.cfg
balanceXonotic.cfg
balancetZork.cfg