From: Rudolf Polzer Date: Tue, 30 Aug 2011 07:48:14 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~26 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac4a808b3f2189d08e289439ea67edefef5fcfe1;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- ac4a808b3f2189d08e289439ea67edefef5fcfe1