From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Mar 2014 18:37:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-6' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~985
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7f0a59ff02affb8270ad9b6ee7e60974ac92df0;p=sdk%2Femulator%2Fqemu.git

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>
---

d7f0a59ff02affb8270ad9b6ee7e60974ac92df0