From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 24 Jun 2010 14:20:50 +0000 (+0300)
Subject: Merge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~501^2~1^2~17
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1396a59e96fd4ef74bea545ca069b98e4d2aa723

Merge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir into mirceakitsune/nex_reticle
---

1396a59e96fd4ef74bea545ca069b98e4d2aa723