From: Rudolf Polzer Date: Thu, 16 Feb 2012 16:53:24 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~70^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c04cb6907581431d36f711c5f884a14ab1f4817e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- c04cb6907581431d36f711c5f884a14ab1f4817e