From: Rudolf Polzer Date: Thu, 10 Feb 2011 12:42:21 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.5.0~311^2~26 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c12eb78d00a660384a0f30c192b13bbbeae44b68;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- c12eb78d00a660384a0f30c192b13bbbeae44b68