From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 11 Jun 2010 20:14:21 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~61^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=481667b4c4389cd5bb01b88f1ccab09fa4735d40;p=xonotic%2Fxonotic-data.pk3dir.git

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

481667b4c4389cd5bb01b88f1ccab09fa4735d40