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)
1  2 
defaultXonotic.cfg

Simple merge