From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 05:47:15 +0000 (+1100)
Subject: Merge branch 'mirceakitsune/world_cubemaps'
X-Git-Tag: xonotic-v0.8.0~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=0743a49be501e1be30d99fd5cc5f5e7ddf9c646d;hp=b7a45adcb6d442c2a1259d8900cbb16d7858e090

Merge branch 'mirceakitsune/world_cubemaps'
---