From: Rudolf Polzer Date: Wed, 15 Aug 2012 09:32:20 +0000 (+0200) Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.7.0~282^2~1 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=802a0058147171be24c302c65b3b963312f1d6ab;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 802a0058147171be24c302c65b3b963312f1d6ab