From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 7 Jul 2010 12:29:13 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~457^2~2^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6701ba40024db6ca89585abfc9f091bada9c7992;p=xonotic%2Fxonotic-data.pk3dir.git

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

6701ba40024db6ca89585abfc9f091bada9c7992