From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 6 Nov 2010 07:34:57 +0000 (+0100)
Subject: Merge remote branch 'origin/cbrutail/decals-xonotic'
X-Git-Tag: xonotic-v0.1.0preview~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e2686150eb9ccd6e33ec7e71d1108902c04c1d2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/cbrutail/decals-xonotic'
---

8e2686150eb9ccd6e33ec7e71d1108902c04c1d2