]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'samual/new_shotgun_tracing' into samual/balance
authorSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:52:38 +0000 (12:52 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:52:38 +0000 (12:52 -0400)
1  2 
balanceXonotic.cfg

Simple merge