commit dc4eb0ba8d0bac8059c060b5965db13f5c86dd12
Merge: 226a67f8 8c282de8
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Sun Nov 13 00:36:02 2016 -0500
Commit:     GitHub <noreply@github.com>
CommitDate: Sun Nov 13 00:36:02 2016 -0500

    Merge pull request #805 from AXDOOMER/master

    Fix number of joystick buttons so Chocolate-Setup doesn't crash

 src/i_joystick.c          | 2 +-
 src/i_joystick.h          | 2 +-
 src/m_config.c            | 7 +++++++
 src/setup/joystick.c      | 2 +-
 src/setup/txt_joybinput.c | 6 +++---
 5 files changed, 13 insertions(+), 6 deletions(-)