Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 5 Nov 2011 22:26:41 +0000 (00:26 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 5 Nov 2011 22:26:41 +0000 (00:26 +0200)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge