From: Rudolf Polzer Date: Fri, 14 Oct 2011 17:26:17 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~44 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=661d9bb4b4b59a3d9cd505527f305d4cd63b913e Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 661d9bb4b4b59a3d9cd505527f305d4cd63b913e