diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-11 12:52:08 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-11 12:52:08 +0000 |
commit | c57ec3249e9839c7ea2e3789f6e40f9ec1c92f55 (patch) | |
tree | 012e65e0b2aefb31098924b6948cc3a057982715 /stubs/slirp.c | |
parent | fe6c53b4bbd2e83f82087bc5e37daa11ffc65879 (diff) | |
parent | dbb2a1326a7af6159861d3d7976c251a15ce0f92 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-5' into staging
input: fixes for the rewrite.
# gpg: Signature made Mon 10 Mar 2014 12:50:25 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-input-5:
input: map INPUT_BUTTON_WHEEL_{UP,DOWN} to legacy input z axis moves.
input: sdl: fix guest_cursor logic.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'stubs/slirp.c')
0 files changed, 0 insertions, 0 deletions