From: Rudolf Polzer Date: Sun, 21 Aug 2011 18:23:53 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~97 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d96aa2b558f8a2c17fd5dbe4b9ee864277d30eb;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 4d96aa2b558f8a2c17fd5dbe4b9ee864277d30eb