From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 9 Jun 2010 23:44:16 +0000 (+0300)
Subject: Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~72
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f1ac88d4074f4d144c64efa0edc76921bbb7b961;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
---

f1ac88d4074f4d144c64efa0edc76921bbb7b961