From: Rudolf Polzer Date: Fri, 6 Jan 2012 17:14:38 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~188^2~19 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff5658039ce99028fe619a9860bbdfb8ac178f05;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- ff5658039ce99028fe619a9860bbdfb8ac178f05