commit c2d26f92d2c17424f14ab8a6c982a3c3a83f43c5
Merge: 6c5c62c3 20660357
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Sat May 14 14:16:36 2016 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Sat May 14 14:16:36 2016 -0400

    Merge pull request #710 from fragglet/sdl2-branch

    joystick: Use SDL GUID to identify joysticks.

 src/i_joystick.c     |  61 +++++++++++++++++++-----
 src/m_config.c       |  12 ++++-
 src/setup/joystick.c | 129 +++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 155 insertions(+), 47 deletions(-)