From: Rudolf Polzer Date: Sat, 17 Sep 2011 14:29:00 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~134 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c6cf849927cb8299a05ad8c6ab9c42088e4b5ed;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 4c6cf849927cb8299a05ad8c6ab9c42088e4b5ed