From: Rudolf Polzer Date: Tue, 18 Jan 2011 16:07:10 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~318^2~31 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61f66a5c0fdf3d16aeca9561f4c6d60ae4cd3977;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 61f66a5c0fdf3d16aeca9561f4c6d60ae4cd3977