From: Samual Lenks Date: Sat, 29 Jun 2013 21:40:10 +0000 (-0400) Subject: Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di... X-Git-Tag: xonotic-v0.8.0~152^2~371 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=439c208fa27d97bafd21330d149280ff2f989cba;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/weapons --- 439c208fa27d97bafd21330d149280ff2f989cba