From: Rudolf Polzer Date: Fri, 3 Sep 2010 05:52:43 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~320 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2fa5a6fc3e04ef71f32fd6a55b14d3ac1cd1aa0;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/crypto2 --- e2fa5a6fc3e04ef71f32fd6a55b14d3ac1cd1aa0