From: Mirio <opivy@hotmail.de>
Date: Mon, 7 Sep 2015 13:45:58 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/silentsiege' into 'master'
X-Git-Tag: xonotic-v0.8.2~168
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed27482a6de25280d8ea2ca7d1e55d4be30a96ff;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/silentsiege' into 'master'

Matthiaskrgr/silentsiege fixes

fix getting stuck for real this time (checked that the final pk3 actually works), also fix 2 see-through brushes.

See merge request !39
---

ed27482a6de25280d8ea2ca7d1e55d4be30a96ff