From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 20:18:59 +0000 (+0300)
Subject: Merge branch 'fruitiex/textures' into fruitiex/runningmanctf
X-Git-Tag: xonotic-v0.5.0~129^2~66
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=2b4c8f543bf6fa98b764ca82cfcf169c6b666cdc

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

2b4c8f543bf6fa98b764ca82cfcf169c6b666cdc