From: cbrutail <ruszkai.akos@gmail.com>
Date: Wed, 4 Jan 2012 15:41:48 +0000 (+0100)
Subject: Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e143b186a0fa81033be1c502e9933068fd6655a2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
---

e143b186a0fa81033be1c502e9933068fd6655a2