]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 16 Dec 2011 12:56:46 +0000 (07:56 -0500)
committerSamual <samual@xonotic.org>
Fri, 16 Dec 2011 12:56:46 +0000 (07:56 -0500)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge