commit 0cd8f2e5fd268f48d09b5d38407ee5226dfd7e1b
Merge: 10b94b8e f14065d0
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Thu May 1 18:08:52 2014 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Thu May 1 18:08:52 2014 -0400

    Merge pull request #393 from chungy/master

    setup: fix usejoystick/use_joystick typo in the previous commit

 src/setup/joystick.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)