commit f1a5a3b9998128d855706dbf8a1a41c9175b43f3
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu May 1 00:46:06 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu May 1 00:46:06 2014 -0400

    setup: Add control for joystick menu button.

    The code is already in place for this but there was no control in
    the setup tool to configure it.
---
 src/setup/joystick.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 3eedda1e..d2fecd45 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -650,6 +650,8 @@ void ConfigJoystick(void)
         AddJoystickControl(button_table, "Jump", &joybjump);
     }

+    AddJoystickControl(button_table, "Activate menu", &joybmenu);
+
     TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, NULL);
     TXT_SignalConnect(window, "closed", JoystickWindowClosed, NULL);