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

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

234777bc1e630f412e1b98ddf5b5e653c1c29eca