From: Samual Lenks Date: Mon, 10 Jun 2013 01:46:57 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons X-Git-Tag: xonotic-v0.8.0~152^2~409 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=316b99cb8eadb3f99c357ffb628002f50f89484f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons --- 316b99cb8eadb3f99c357ffb628002f50f89484f