From: Rudolf Polzer Date: Mon, 1 Nov 2010 14:25:47 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.1.0preview~59 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a894757eae152b20734b24a2f9faed3fb656440;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir --- 2a894757eae152b20734b24a2f9faed3fb656440