]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 5 Oct 2011 06:17:52 +0000 (02:17 -0400)
committerSamual <samual@xonotic.org>
Wed, 5 Oct 2011 06:17:52 +0000 (02:17 -0400)
1  2 
defaultXonotic.cfg
qcsrc/server/defs.qh

Simple merge
Simple merge