From: Rudolf Polzer Date: Tue, 18 May 2010 18:29:18 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview~603 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=085647522d27ce3fe59a351d050d9cb9ac4be81b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir --- 085647522d27ce3fe59a351d050d9cb9ac4be81b