From: Rudolf Polzer Date: Wed, 9 Feb 2011 20:25:51 +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^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a8f3090c420e0defca7e6a0e5a0b16d3992cc61;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir --- 2a8f3090c420e0defca7e6a0e5a0b16d3992cc61