From: Rudolf Polzer Date: Mon, 25 Feb 2013 15:47:13 +0000 (+0100) Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.7.0~62^2~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=56e60e1840a6b020edfcd6bbf2c8d8ae97297fa0;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 56e60e1840a6b020edfcd6bbf2c8d8ae97297fa0