From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 16:52:38 +0000 (-0400)
Subject: Merge branch 'samual/new_shotgun_tracing' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce4e8e279ed2d26f8a9205014092218df2499757;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/new_shotgun_tracing' into samual/balance
---

ce4e8e279ed2d26f8a9205014092218df2499757