]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34f3c1d 7e52687)
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)
Allow func_button to be deactivated by relay_deactivate

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


Trivial merge