From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 7 Nov 2010 14:24:10 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/nexballtextures'
X-Git-Tag: xonotic-v0.1.0preview~185
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2cae82e1c3d4a860a6e649c0e89a2a9eb2ff5d80

Merge remote branch 'origin/fruitiex/nexballtextures'
---

2cae82e1c3d4a860a6e649c0e89a2a9eb2ff5d80