From: Rudolf Polzer Date: Fri, 13 Jan 2012 19:54:42 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.6.0~28 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d0059d903039167120a2b49e29e77a20079afebf Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir --- d0059d903039167120a2b49e29e77a20079afebf