]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/fix-bot-wandering
authormand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:35:14 +0000 (20:35 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 21 Apr 2011 23:35:14 +0000 (20:35 -0300)
commitcd62ff7ea2fd1a62e8c3b903eb06a953016178cd
treedcffb77a13686a3ea0777d3aa6af691f896018d7
parentac3763d7c435f01d2cf2cf9348a618dad547363d
parent69e0872e58d04b304ebb23900724f5767d8b41cc
Merge branch 'master' into mand1nga/fix-bot-wandering