From: Rudolf Polzer Date: Fri, 26 Nov 2010 19:35:22 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview~101 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b8473b5128d64ae34f128ad44933834139aa364;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 7b8473b5128d64ae34f128ad44933834139aa364