From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 19 Jun 2010 19:22:01 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/wickedhud'
X-Git-Tag: xonotic-v0.1.0preview~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5790b9e216e5a1f4a7846480ef2e5a59789d714b;p=xonotic%2Fmediasource.git

Merge remote branch 'origin/fruitiex/wickedhud'
---

5790b9e216e5a1f4a7846480ef2e5a59789d714b