From: Mirio <opivy@hotmail.de>
Date: Mon, 13 Mar 2017 16:09:50 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/final_rage' into 'master'
X-Git-Tag: xonotic-v0.8.2~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7238b80221f7ee48494d53c0b72ddf81f67850c3;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/final_rage' into 'master'

final rage: make 2 lamp models solid (in quad room)

See merge request !77
---

7238b80221f7ee48494d53c0b72ddf81f67850c3