Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Jun 2010 22:59:33 +0000 (01:59 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
Simple merge