From: Rudolf Polzer Date: Sun, 31 Oct 2010 13:40:16 +0000 (+0100) Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair' X-Git-Tag: xonotic-v0.1.0preview~224 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2805e22b6636b63410a30e4fec68e1ae5ecadc87 Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair' --- 2805e22b6636b63410a30e4fec68e1ae5ecadc87