Merge pull request #1111 from Karlson2k/UseJoystick
authorjmarshallnz <jcmarsha@gmail.com>
Sun, 8 Jul 2012 20:56:03 +0000 (13:56 -0700)
committerjmarshallnz <jcmarsha@gmail.com>
Sun, 8 Jul 2012 20:56:03 +0000 (13:56 -0700)
commitba554f1bc0f165ac494bae3ccaec4b74631f3574
tree4357ca0996bd1d0b7538f48662356fb39bebf562
parentac5bd3471664841e6b611a4b01a11abac50ee1cd
parentbd9b6c6b8739b1729b6adb74737cfe4906274b54
Merge pull request #1111 from Karlson2k/UseJoystick

[input] Add 'Enable Joystick' to GUI settings. Fix for http://trac.xbmc.org/ticket/13146
language/English/strings.po
xbmc/Application.cpp
xbmc/settings/GUISettings.cpp