From: Rudolf Polzer Date: Mon, 10 May 2010 06:44:56 +0000 (+0200) Subject: Merge branch 'master' into diabolik/umbraplayermodel X-Git-Tag: xonotic-v0.1.0preview~638 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eae0f8d6df2195d6fa4cd4a4ed1671b946f3d75b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into diabolik/umbraplayermodel --- eae0f8d6df2195d6fa4cd4a4ed1671b946f3d75b