From: Mario Date: Mon, 9 Dec 2013 07:13:48 +0000 (+1100) Subject: Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di... X-Git-Tag: xonotic-v0.8.0~152^2~273 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e511b0e845ad1696a6ff992d9bf80f2aa1b9e7ad;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/weapons --- e511b0e845ad1696a6ff992d9bf80f2aa1b9e7ad