From: Rudolf Polzer Date: Fri, 7 Oct 2011 13:15:54 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~81 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23e84289e3aee3e0ea75404ed0eb056d4e6bbcbd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 23e84289e3aee3e0ea75404ed0eb056d4e6bbcbd