Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:18:33 +0000 (17:18 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:18:33 +0000 (17:18 +0300)
commit4a5cfd617b0f9c3dec82873ce888640a6997bc0f
treeb553ec78e4f97eaa64f7b2a651816c31219d93d6
parentb08b9feba88065d7f79ebf60d3d5fd5a6928f52e
parent893a1657d649f4f9b9bb043097e627cb769b552e
Merge branch 'master' into mirceakitsune/nex_reticle
defaultXonotic.cfg