]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 30 Nov 2011 08:59:45 +0000 (03:59 -0500)
committerSamual <samual@xonotic.org>
Wed, 30 Nov 2011 08:59:45 +0000 (03:59 -0500)
commit2b2f4843f735c217616212640a58e88f5dc2a5f0
treef398a7db974dd41031b632f9a7e9e6defd41795f
parent2ad2fba42d45a9c5d079dae8d3439073a16b7040
parent0396c956370d03a0de773812fd48963fe028018e
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/server/progs.src