diff options
author | Peter Maydell | 2017-02-20 14:38:34 +0100 |
---|---|---|
committer | Peter Maydell | 2017-02-20 14:38:34 +0100 |
commit | 6753e4ed150ca1f94651aad06c031680a0be6cac (patch) | |
tree | 32b143279ec3db819f40d33e1b539ffdde699a5b /scripts/qapi2texi.py | |
parent | Merge remote-tracking branch 'remotes/huth/tags/coldfire-20170219' into staging (diff) | |
parent | Add wctablet device (diff) | |
download | qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.tar.gz qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.tar.xz qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20170220-1' into staging
input: add wctablet, ps2 fix
# gpg: Signature made Mon 20 Feb 2017 11:42:12 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-input-20170220-1:
Add wctablet device
ps2: fix mouse mappings for right/middle button
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi2texi.py')
0 files changed, 0 insertions, 0 deletions