From: Rudolf Polzer Date: Mon, 15 Aug 2011 09:22:17 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~140^2~2^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6d8496b115f1af85e7fae43ab05ce10183de772f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 6d8496b115f1af85e7fae43ab05ce10183de772f