From: FruitieX <fruitiex@gmail.com>
Date: Fri, 12 Nov 2010 06:30:41 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.1.0preview~134^2~6
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=81389844a546e48635a119927ffcf6e1ee15f689

Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
---

81389844a546e48635a119927ffcf6e1ee15f689