]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 6 Dec 2011 20:42:37 +0000 (15:42 -0500)
committerSamual <samual@xonotic.org>
Tue, 6 Dec 2011 20:42:37 +0000 (15:42 -0500)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge