commit 19f2e55200a8a9fb12faa99cd5ed424ad5a10391
Merge: 5ddb558a 72d92602
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Sat Apr 11 22:54:00 2015 -0400
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Sat Apr 11 22:54:00 2015 -0400

    Merge pull request #521 from chungy/xbone-pad

    setup: add support for the Xbox One controller on Linux

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