From: Mario <zacjardine@y7mail.com>
Date: Sat, 20 Dec 2014 06:18:11 +0000 (+1100)
Subject: Merge branch 'Mario/cubemaps_revert_new'
X-Git-Tag: xonotic-v0.8.0~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79e4f40af285410bfa3ca5d4cff1c41c5d4f6713;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mario/cubemaps_revert_new'
---

79e4f40af285410bfa3ca5d4cff1c41c5d4f6713