From: terencehill Date: Wed, 16 Jun 2010 23:45:57 +0000 (+0200) Subject: Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud X-Git-Tag: xonotic-v0.1.0preview~541^2~22^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=353583ae1fbdd0c6fc7c2b53148e4e5e868eec99;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud --- 353583ae1fbdd0c6fc7c2b53148e4e5e868eec99