From: terencehill <piuntn@gmail.com>
Date: Sat, 4 Dec 2010 19:11:03 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/crosshair_colors
X-Git-Tag: xonotic-v0.1.0preview~73^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cdf8d22631c0acdf97bd69bdd00ab86e96b30b73;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/crosshair_colors
---

cdf8d22631c0acdf97bd69bdd00ab86e96b30b73