From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 02:25:05 +0000 (+0000)
Subject: Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'
X-Git-Tag: xonotic-v0.8.5~147
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa0676b6956aa549117b240abb8dd639b40b3680;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'

Update func_button flags for radiant

See merge request xonotic/xonotic-maps.pk3dir!105
---

aa0676b6956aa549117b240abb8dd639b40b3680