From: Rudolf Polzer Date: Fri, 21 Dec 2012 11:20:26 +0000 (+0100) Subject: Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.7.0~164 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c927fe407ea582cd310d6e0b7309221d0145e3c2;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir --- c927fe407ea582cd310d6e0b7309221d0145e3c2