]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commite48821ed9b999615d6b04449c533cd92ff615b72
tree25a0c3706cdd9edb2ca0281e20338affcfa287ab
parenteae2080bff293f9b07df61df4b5a6dc0494169d3
parente4314bf532727c96210bf8afa641dcc8b557222f
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_world.qc