summaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
authorSimon Howard2015-04-11 22:54:55 -0400
committerSimon Howard2015-04-11 22:54:55 -0400
commit022ea10707f0b3e6d4238b757918ac1a735ce00c (patch)
tree404bcd6762ae339ee140d4f0763c47769b99fa1a /src/setup
parent282c7fdaaf7ff65709c99ba024e1972a98ed58d1 (diff)
parent19f2e55200a8a9fb12faa99cd5ed424ad5a10391 (diff)
downloadchocolate-doom-022ea10707f0b3e6d4238b757918ac1a735ce00c.tar.gz
chocolate-doom-022ea10707f0b3e6d4238b757918ac1a735ce00c.tar.bz2
chocolate-doom-022ea10707f0b3e6d4238b757918ac1a735ce00c.zip
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/joystick.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 6c26e950..09dbb4a1 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -352,6 +352,13 @@ static const known_joystick_t known_joysticks[] =
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,