From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 6 Dec 2010 08:41:56 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/crosshair_colors'
X-Git-Tag: xonotic-v0.1.0preview~73
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f79b965d51821cdcef5065f2b3b6b545c6c24382;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/crosshair_colors'
---

f79b965d51821cdcef5065f2b3b6b545c6c24382