From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 6 Aug 2013 21:39:03 +0000 (+0200)
Subject: Merge branch 'matthiaskrgr/shader_stuff' into matthiaskrgr/unsealedtrial2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27f3cab806fd9255df6ae75958778af7a8b54306;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/shader_stuff' into matthiaskrgr/unsealedtrial2
---

27f3cab806fd9255df6ae75958778af7a8b54306