From: Rudolf Polzer Date: Fri, 19 Aug 2011 04:49:47 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~110^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2831fae1af2cf3e9b5214cc29135612eed2d954f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 2831fae1af2cf3e9b5214cc29135612eed2d954f