From: Rudolf Polzer Date: Tue, 12 Oct 2010 17:02:46 +0000 (+0200) Subject: Merge remote branch 'origin/fruitiex/crosshairs' X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d43d6555e165f78d86f5a47ebdf6be08c29c70df;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/fruitiex/crosshairs' --- d43d6555e165f78d86f5a47ebdf6be08c29c70df