From: Samual Lenks <samual@xonotic.org>
Date: Tue, 1 Apr 2014 03:01:47 +0000 (-0400)
Subject: Merge branch 'samual/weapons' into Mario/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~27^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba1635faec69d9ae0cb4fe4713f1bf6e43fca90a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/weapons' into Mario/weapons
---

ba1635faec69d9ae0cb4fe4713f1bf6e43fca90a