[xboxdrv] 18/78: Merge pull request #70 from shblythe/stable

[Andrey Rahmatullin]

This is an automated email from the git hooks/post-receive script.

wrar-guest pushed a commit to branch master
in repository xboxdrv.

commit fe3237e949b571dc76394ae540a89c7fd63fccaa
Merge: 9d0aafd 078a65d
Author: Ingo Ruhnke <grumbel at gmx.de>
Date:   Mon Jun 2 11:14:41 2014 +0200

    Merge pull request #70 from shblythe/stable
    
    Issue #65: Added PID/VID for Afterglow AX.1 Gamepad for Xbox 360

 src/xpad_device.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --cc src/xpad_device.cpp
index e8588e7,f468e82..bfa1b39
--- a/src/xpad_device.cpp
+++ b/src/xpad_device.cpp
@@@ -79,9 -79,9 +79,10 @@@ XPadDevice xpad_devices[] = 
    { GAMEPAD_XBOX360,          0x0738, 0xcb03, "Saitek P3200 Rumble Pad - PC/Xbox 360" },
    { GAMEPAD_XBOX360,          0x0738, 0xcb02, "Saitek Cyborg Rumble Pad - PC/Xbox 360" },
    { GAMEPAD_XBOX360,          0x0e6f, 0x0201, "Pelican TSZ360 Pad" },
+   { GAMEPAD_XBOX360,          0x0e6f, 0x0113, "Afterglow AX.1 Gamepad for Xbox 360" },
    { GAMEPAD_XBOX360,          0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360" },
    { GAMEPAD_XBOX360,          0x0e6f, 0x0401, "Logic3 Controller" },
 +  { GAMEPAD_XBOX360,          0x0e6f, 0x0301, "Logic3 Controller" },
    { GAMEPAD_XBOX360,          0x12ab, 0x0301, "PDP AFTERGLOW AX.1" },
    { GAMEPAD_XBOX360_GUITAR,   0x1430, 0x4748, "RedOctane Guitar Hero X-plorer" },
    { GAMEPAD_XBOX360_GUITAR,   0x1bad, 0x0002, "Harmonix Guitar for Xbox 360" },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git