From: Rudolf Polzer Date: Wed, 3 Nov 2010 20:41:25 +0000 (+0100) Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview~203 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3024309e2c0576552bfb2da02ba513662c997768;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 3024309e2c0576552bfb2da02ba513662c997768