From: Rudolf Polzer Date: Tue, 11 Oct 2011 04:59:36 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~61^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f2deeec8e13662914b5a69e916d550a99a6cd6b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 7f2deeec8e13662914b5a69e916d550a99a6cd6b