From: Rudolf Polzer Date: Mon, 7 Nov 2011 08:17:04 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~35^2~66 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=87bcf91b0bb31ca5292d26e18026b628db6185fa;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 87bcf91b0bb31ca5292d26e18026b628db6185fa