Merge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:20:50 +0000 (17:20 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:20:50 +0000 (17:20 +0300)
commit1396a59e96fd4ef74bea545ca069b98e4d2aa723
tree4dbb60a6ae409ed047762e6b803e7000ef1cce88
parent4a5cfd617b0f9c3dec82873ce888640a6997bc0f
parentbf5b51084079dc2197390c1b9bd540666a1a205e
Merge branch 'mirceakitsune/nex_reticle' of ssh://git.xonotic.org/xonotic-data.pk3dir into mirceakitsune/nex_reticle