Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-6' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 18:37:00 +0000 (18:37 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Mar 2014 18:37:01 +0000 (18:37 +0000)
commitd7f0a59ff02affb8270ad9b6ee7e60974ac92df0
tree851e2f982d96e4b68dbc3956282fe45f77c7d3ac
parent4a9a1f49c58fb0cbdd17ad3de2cc682aad3230b8
parentd58b9122716bc444305515ead3a69b91d807bf3c
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-6' into staging

input: activate legacy kbd
gtk: Add mouse wheel support

# gpg: Signature made Thu 13 Mar 2014 10:34:17 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-6:
  gtk: Add mouse wheel support
  input: activate legacy kbd

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>