From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 00:15:15 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/barrels' into 'master'
X-Git-Tag: xonotic-v0.8.2~83
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=cab778c371fe21e6a422fd6a53323d34d3d22146;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/barrels' into 'master'

maps: catharsis, courtfun, dance, drain, glowplant, oilrig, runningman, runningmanctf, solarium, vorix: unify barrel explosions to more sane values.

See merge request !68
---

cab778c371fe21e6a422fd6a53323d34d3d22146