]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitce4e8e279ed2d26f8a9205014092218df2499757
treef75388e135a1c2d083fa5e8f0b3a8c0b5269c8e2
parent181da63832bf0ca77604ec10e07d8ae3357aa09b
parent7d26e546fdd2a816edae2e3347267f39026e7fbe
Merge branch 'samual/new_shotgun_tracing' into samual/balance
balanceXonotic.cfg