]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'DefaultUser/func_button_relay' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 15:30:22 +0000 (15:30 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 15:30:22 +0000 (15:30 +0000)
commita224c83e4d4e004afcb17afcbc3ed47b0d7ad2cd
tree2ad10faed320c0b38abb93ea01837cc546f99e16
parent34f3c1d754abe766f800408a3e7bb0172ddda21f
parent7e5268799e95d0dd6f2b77ed4e097b0adc755f2b
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