From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Sep 2018 15:30:22 +0000 (+0000)
Subject: Merge branch 'DefaultUser/func_button_relay' into 'master'
X-Git-Tag: xonotic-v0.8.5~1807^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a224c83e4d4e004afcb17afcbc3ed47b0d7ad2cd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/func_button_relay' into 'master'

Allow func_button to be deactivated by relay_deactivate

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

a224c83e4d4e004afcb17afcbc3ed47b0d7ad2cd