From: Rudolf Polzer Date: Fri, 14 Oct 2011 19:07:36 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~41 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f45f7d0938eefdfcf0825a7d79275335a07a4ed6;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- f45f7d0938eefdfcf0825a7d79275335a07a4ed6