From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 29 Sep 2010 08:52:21 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/fruitiex-textures
X-Git-Tag: xonotic-v0.5.0~129^2~60^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b635fb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/fruitiex-textures
---

4b635fbecbb0a8e4e6e5f6d19cf2b420ec87d244