From: Rudolf Polzer Date: Tue, 24 May 2011 18:12:12 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~98^2~18 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=269b6bdce9c1f32a3382921aa8e777bdbdbd062e Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir --- 269b6bdce9c1f32a3382921aa8e777bdbdbd062e