Revert "Merge remote-tracking branch 'upstream/master'"
authorelupus <elupus@xbmc.org>
Wed, 14 Sep 2011 21:00:49 +0000 (23:00 +0200)
committerelupus <elupus@xbmc.org>
Wed, 14 Sep 2011 21:00:49 +0000 (23:00 +0200)
commitb0f4867845a5ee4fe7f00bacf3ac27b45d1dc1d4
tree111a6ebae61331d6b3a33f642c4cd770a5b465ee
parent994d043c198b8b386551a854c5520ab780a70495
Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 994d043c198b8b386551a854c5520ab780a70495, reversing
changes made to c3ffb64bcc83c03b4160a4af0d97579d05afcca0.
system/deviceidmappings.xml
xbmc/Application.cpp
xbmc/input/KeymapLoader.cpp
xbmc/input/KeymapLoader.h
xbmc/windowing/windows/WinEventsWin32.cpp
xbmc/windowing/windows/WinEventsWin32.h