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

Merge branch 'terencehill/crosshair_colors' into fruitiex/panelhud
---

cb0dd369118ab822156128516ebcdd8350c70e9b