From: Rudolf Polzer Date: Tue, 19 Oct 2010 06:46:55 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/crosshairs_src' X-Git-Tag: xonotic-v0.1.0preview~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c20d1012d3cdf27a232f61c87156448939b3aa0e;p=xonotic%2Fmediasource.git Merge remote branch 'refs/remotes/origin/fruitiex/crosshairs_src' --- c20d1012d3cdf27a232f61c87156448939b3aa0e