From: Rudolf Polzer Date: Thu, 20 Oct 2011 06:54:16 +0000 (+0200) Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~25 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8caa84ccb333234aeb013902a0f1badf8f94b06;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- e8caa84ccb333234aeb013902a0f1badf8f94b06