]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit03f0168f8ee741f9c8093c20d6086b43a7d22156
tree1f7678f924c30a832ca4de4705cb51d720049f1e
parent046d341f40f7dc21d65976d11d7c94f0ccdde0b4
parent82507d5018689bbf07c3cf7a1408d7052b5257b4
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src