commit 022ea10707f0b3e6d4238b757918ac1a735ce00c
Merge: 282c7fda 19f2e552
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Apr 11 22:54:55 2015 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Apr 11 22:54:55 2015 -0400

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

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