From: Rudolf Polzer Date: Fri, 12 Nov 2010 21:44:10 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview~153 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b249788aac5c137dea22e6330821c1685545ad79;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- b249788aac5c137dea22e6330821c1685545ad79