From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 19:53:35 +0000 (+0300)
Subject: Merge branch 'fruitiex/textures' into fruitiex/runningmanctf
X-Git-Tag: xonotic-v0.5.0~129^2~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=521ff0ed298123f87a0fd8aee84dee796d66851a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'fruitiex/textures' into fruitiex/runningmanctf
---

521ff0ed298123f87a0fd8aee84dee796d66851a