From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 16:55:33 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~362^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c822b9fd4218fb4eea2f789c4cf3ab03f6aa2aa5;p=xonotic%2Fxonotic-data.pk3dir.git

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

c822b9fd4218fb4eea2f789c4cf3ab03f6aa2aa5