From: Rudolf Polzer Date: Thu, 4 Aug 2011 17:37:54 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~81 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0235bb6cbb2d19e4e93f10f5a45792c0add9291;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir --- e0235bb6cbb2d19e4e93f10f5a45792c0add9291