From: Rudolf Polzer Date: Fri, 2 Jul 2010 08:19:20 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle' X-Git-Tag: xonotic-v0.1.0preview~501^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e0eff1d6102a779c6475e65a96cd5765a930a7e;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/mirceakitsune/nex_reticle' --- 6e0eff1d6102a779c6475e65a96cd5765a930a7e