From: Rudolf Polzer Date: Mon, 10 Oct 2011 20:05:30 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~63 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=580f6448acf65283d6c8b3a1baff2039782e239d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 580f6448acf65283d6c8b3a1baff2039782e239d