From: Rudolf Polzer Date: Fri, 30 Dec 2011 09:02:18 +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~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72c857f6853bb4fec03457d94ec7b4d49d757945;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 72c857f6853bb4fec03457d94ec7b4d49d757945