From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 1 Aug 2010 16:36:03 +0000 (+0300)
Subject: Merge branch 'fruitiex/lightshaders' into fruitiex/epsilon
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53f03d25cf99204ec4602f8e6c3dc7758c79f0f8;p=xonotic%2Fxonotic-maps.pk3dir.git

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

53f03d25cf99204ec4602f8e6c3dc7758c79f0f8