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

Merge branch 'fruitiex/jumppadmodel1' into fruitiex/epsilon

Conflicts:
	scripts/exx.shader
	scripts/trak5x.shader
---

86b528612263e11b9b8c6fbf929b95cfcb972f42