From: FruitieX <fruitiex@gmail.com>
Date: Fri, 12 Nov 2010 05:11:56 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/colorpicker_pos' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.1.0preview~134^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed9746e993857fb258c7148fe14559b57fa10709;p=xonotic%2Fxonotic-data.pk3dir.git

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

ed9746e993857fb258c7148fe14559b57fa10709