From: Rudolf Polzer Date: Thu, 16 Dec 2010 12:39:06 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.1.0preview~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=219c1a38ec97e956229d5139ac787a46ed4a7a9d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 219c1a38ec97e956229d5139ac787a46ed4a7a9d