From: tzork <jakob_mg@hotmail.com>
Date: Tue, 25 Jan 2011 21:33:00 +0000 (+0100)
Subject: Merge remote branch 'origin/diabolik/trak-textures'
X-Git-Tag: xonotic-v0.5.0~116^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c64c32952029e5eb65ef41a7a9ef3d8bd6b82492;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/diabolik/trak-textures'
---

c64c32952029e5eb65ef41a7a9ef3d8bd6b82492