From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 30 Jul 2010 13:53:04 +0000 (+0300)
Subject: Merge branch 'fruitiex/cubemaps' into fruitiex/epsilon
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11a202ec233a1fcf4f107e99ea4ccfe0554cd74d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'fruitiex/cubemaps' into fruitiex/epsilon
---

11a202ec233a1fcf4f107e99ea4ccfe0554cd74d