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

Merge branch 'matthiaskrgr/atelier' into 'master'

Matthiaskrgr/atelier remove "respawnrings" under items, make light-models solid for bullets.

See merge request !36
---

2778e1a0790f26ea980f6c1876dbb570969dbd42