From: Rudolf Polzer Date: Fri, 20 Jan 2012 16:17:25 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~104^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ab57b248854a04ac90ab5652f409770a20139c0;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 2ab57b248854a04ac90ab5652f409770a20139c0