Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Jun 2010 10:53:07 +0000 (13:53 +0300)
1  2 
defaultXonotic.cfg

Simple merge