commit 7b128dc1e7586ad00dc63d1be272ec61cfe7526b
Merge: c37d25a6 b92fa936
Author:     Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Mon Apr 3 16:08:55 2017 +0100
Commit:     GitHub <noreply@github.com>
CommitDate: Mon Apr 3 16:08:55 2017 +0100

    Merge pull request #904 from jmtd/nes30pro

    Adjust NES30Pro joypad settings, add FC30 Pro

    Thanks to @chungy for verifying and expanding the mappings for NES30Pro/Linux

 src/setup/joystick.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 7 deletions(-)