From: Rudolf Polzer Date: Thu, 5 Apr 2012 16:09:50 +0000 (+0200) Subject: Merge branch 'master' into mirceakitsune/world_cubemaps X-Git-Tag: xonotic-v0.8.0~5^2~2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ead3a9d3331da4d9e93222970912cc11f0f1043d;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into mirceakitsune/world_cubemaps --- ead3a9d3331da4d9e93222970912cc11f0f1043d