From: Rudolf Polzer Date: Thu, 22 Dec 2011 18:40:08 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~75 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=9fc23843b1e14e6fb0242e6a13e33162e74cc067;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 9fc23843b1e14e6fb0242e6a13e33162e74cc067