]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 24 Dec 2011 04:02:53 +0000 (23:02 -0500)
committerSamual <samual@xonotic.org>
Sat, 24 Dec 2011 04:02:53 +0000 (23:02 -0500)
commita6df31e62548b64d6f801bc5d50a1f51e4ac27b8
treed658341da25a30adcc4bcf3dacc61790ba321bb8
parent86b0fa45c1e2dc738013683984190744415c1f28
parent540e6343c00ee98222eb5f6cc3907a95eb0564f2
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg