From: Rudolf Polzer Date: Sun, 10 Apr 2011 15:57:56 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~307^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00f45c5adc0efe49e799a3aef81d1d6fe540a90d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 00f45c5adc0efe49e799a3aef81d1d6fe540a90d