]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/samual/config_updates'
authorSamual <samual@xonotic.org>
Thu, 22 Dec 2011 22:36:41 +0000 (17:36 -0500)
committerSamual <samual@xonotic.org>
Thu, 22 Dec 2011 22:36:41 +0000 (17:36 -0500)
commitb7ee6d6b8bb89cad86c1498abc590b1b838ee5bf
tree53c0edd15a9ecaf17b2a394325f5e44c1e439b0e
parentbd5ece69880b52958f63295510c3c505f163c9d9
parent0904276fb230f123ef1afef3ccef9a47de25be67
Merge remote branch 'origin/samual/config_updates'