From: Rudolf Polzer Date: Sat, 18 Feb 2012 16:48:49 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~70 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f54051398821a9e2d3f2e7fdcd8dd78d85aca10;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 9f54051398821a9e2d3f2e7fdcd8dd78d85aca10