From: Rudolf Polzer Date: Fri, 23 Dec 2011 22:37:29 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~66 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6247d490047631d05b4e1eba9590fcc1a8cce5aa;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 6247d490047631d05b4e1eba9590fcc1a8cce5aa