From: Mirio <opivy@hotmail.de>
Date: Thu, 30 Mar 2017 17:52:16 +0000 (+0000)
Subject: Merge branch 'maddin/shader-weapclip' into 'master'
X-Git-Tag: xonotic-v0.8.2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ea83103ea469debbc0e5fd0f09a95a02951598f1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'maddin/shader-weapclip' into 'master'

Remove "surfaceparm nomarks" from weapclip shader

See merge request !54
---

ea83103ea469debbc0e5fd0f09a95a02951598f1