From: Rudolf Polzer Date: Sat, 19 Feb 2011 16:31:06 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~311^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c717c934c01c3868efc7e2278d9aa9b27db295f1;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- c717c934c01c3868efc7e2278d9aa9b27db295f1