From: Samual <samual@xonotic.org>
Date: Mon, 12 Sep 2011 07:25:55 +0000 (-0400)
Subject: Merge remote branch 'origin/terencehill/essential_weapons_panel'
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14c1ca03357b3910438d56a879788a435377968b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/essential_weapons_panel'
---

14c1ca03357b3910438d56a879788a435377968b