From: Rudolf Polzer Date: Sun, 21 Aug 2011 17:22:57 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~48 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8278ebf65b5d685d2e8ae7a429d21f3a24e1e439;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir --- 8278ebf65b5d685d2e8ae7a429d21f3a24e1e439