From: Rudolf Polzer Date: Wed, 26 Jan 2011 07:55:36 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~116 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e68a3522efc9f5a5bccabf96ec2e641e0b0fee1b;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir --- e68a3522efc9f5a5bccabf96ec2e641e0b0fee1b