From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 25 Aug 2012 12:06:37 +0000 (+0300)
Subject: Merge branch 'mirceakitsune/world_cubemaps' of git://de.git.xonotic.org/xonotic/xonot... 
X-Git-Tag: xonotic-v0.8.0~5^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a109e635bf9bc51e17396445b85090b7a583e638;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'mirceakitsune/world_cubemaps' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirceakitsune/world_cubemaps
---

a109e635bf9bc51e17396445b85090b7a583e638