From: Rudolf Polzer Date: Tue, 26 Jul 2011 12:17:07 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~148^2~37^2~3 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e3821f27c45eb33dcda39062a5aede57719f8f8b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- e3821f27c45eb33dcda39062a5aede57719f8f8b