Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
committerSamual <samual@xonotic.org>
Sun, 4 Dec 2011 20:05:47 +0000 (15:05 -0500)
1  2 
defaultXonotic.cfg
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
Simple merge