From: Rudolf Polzer Date: Wed, 3 Nov 2010 09:28:41 +0000 (+0100) Subject: Merge remote branch 'refs/remotes/origin/terencehill/crosshair_fix' X-Git-Tag: xonotic-v0.1.0preview~207 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=182c29e16af46d7604372126913d09477615aa1b Merge remote branch 'refs/remotes/origin/terencehill/crosshair_fix' --- 182c29e16af46d7604372126913d09477615aa1b