From: Mirio <opivy@hotmail.de>
Date: Mon, 13 Mar 2017 16:05:25 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/SE' into 'master'
X-Git-Tag: xonotic-v0.8.2~59
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=147c1c073fbbe9b0df165aaa9085ef2afaf66c04;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/SE' into 'master'

space-elevator: use default damage instead of 1000

See merge request !79
---

147c1c073fbbe9b0df165aaa9085ef2afaf66c04