Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Nov 2011 14:21:04 +0000 (16:21 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 29 Nov 2011 14:21:04 +0000 (16:21 +0200)
1  2 
defaultXonotic.cfg
effectinfo.txt
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/sv_main.qc

Simple merge
diff --cc effectinfo.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge