From: Mirio <opivy@hotmail.de>
Date: Fri, 15 Jun 2018 17:21:42 +0000 (+0000)
Subject: Merge branch 'Mario/func_breakable_playercheck' into 'master'
X-Git-Tag: xonotic-v0.8.5~2043
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8a24bd3f647bf020adbc4bea3e78120644fd8f0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/func_breakable_playercheck' into 'master'

Merge branch Mario/func_breakable_playercheck (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!566
---

d8a24bd3f647bf020adbc4bea3e78120644fd8f0