[xboxdrv] 22/78: Synced xpad_device.cpp with master branch

[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 fb787abe320741d8c341a9ad62c9a0ec513fc2cb
Author: Ingo Ruhnke <grumbel at gmail.com>
Date:   Fri Jun 6 10:28:51 2014 +0200

    Synced xpad_device.cpp with master branch
---
 src/xpad_device.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xpad_device.cpp b/src/xpad_device.cpp
index ffe7183..6db3a78 100644
--- a/src/xpad_device.cpp
+++ b/src/xpad_device.cpp
@@ -64,6 +64,7 @@ XPadDevice xpad_devices[] = {
   { GAMEPAD_XBOX360,          0x0738, 0xb726, "Mad Catz Xbox controller - MW2" },
   { GAMEPAD_XBOX360,          0x0738, 0xf738, "Super SFIV FightStick TE S" },
   { GAMEPAD_XBOX360,          0x0738, 0x4718, "Mad Catz Street Fighter IV FightStick SE" },
+  { GAMEPAD_XBOX360,          0x0738, 0x4738, "Mad Catz Street Fighter IV FightStick TE" },
   { GAMEPAD_XBOX360,          0x0738, 0xbeef, "Mad Catz Xbox 360 Controller" },
   { GAMEPAD_XBOX360,          0x0f0d, 0x000a, "Hori Co. DOA4 FightStick" },
   { GAMEPAD_XBOX360,          0x0f0d, 0x000d, "Hori Fighting Stick Ex2" },
@@ -98,6 +99,7 @@ XPadDevice xpad_devices[] = {
   { GAMEPAD_XBOX360,          0x15e4, 0x3f10, "Batarang Xbox 360 controller" },
   { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0291, "Microsoft Xbox 360 Wireless Controller" }, // RF Module from the Xbox360
   { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0719, "Microsoft Xbox 360 Wireless Controller (PC)" }, // official Wireless Receiver
+  { GAMEPAD_XBOX360,          0x24c6, 0x5000, "Razer Atrox Arcade Stick" },
   { GAMEPAD_XBOX360,          0x1689, 0xfd00, "Razer Onza" },
   { GAMEPAD_XBOX360,          0x1689, 0xfd01, "Razer Onza Tournament Edition" },
   { GAMEPAD_XBOX360,          0x1532, 0x0037, "Razer Sabertooth" },

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