ref: 022ea10707f0b3e6d4238b757918ac1a735ce00c
parent: 282c7fdaaf7ff65709c99ba024e1972a98ed58d1
parent: 19f2e55200a8a9fb12faa99cd5ed424ad5a10391
author: Simon Howard <fraggle@soulsphere.org>
date: Sat Apr 11 18:54:55 EDT 2015
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -352,6 +352,13 @@
xbox360_controller_linux,
},
+ // Xbox One controller as it appears on Linux.
+ {
+ "Microsoft X-Box One pad",
+ 6, 11, 1,
+ xbox360_controller_linux,
+ },
+
{
"Logitech Dual Action",
4, 12, 1,