Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
committerSamual <samual@xonotic.org>
Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge