From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 3 Nov 2010 18:38:21 +0000 (+0100)
Subject: Merge branch 'cbrutail/decals-xonotic' into tzork/nexballarena
X-Git-Tag: xonotic-v0.1.0preview~42^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c2496212d72e4a10f62754c35c88ae6a59a9197;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/decals-xonotic' into tzork/nexballarena
---

7c2496212d72e4a10f62754c35c88ae6a59a9197