From: terencehill <piuntn@gmail.com>
Date: Tue, 26 Oct 2010 22:12:06 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~134^2~6^2~29
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=ef3392cee1b001e5b0d47efb5d8d440701186826;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/newpanelhud
---

ef3392cee1b001e5b0d47efb5d8d440701186826