From: Peter Maydell Date: Thu, 1 May 2014 12:51:23 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=52b08670e2c9031f74b58d3e9864a8d8f152ee31;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-2' into staging sdl2: mouse wheel support, ui config notify # gpg: Signature made Tue 29 Apr 2014 11:17:01 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-sdl-2: sdl2: Support mouse wheel sdl2: add ui info setting. Signed-off-by: Peter Maydell --- 52b08670e2c9031f74b58d3e9864a8d8f152ee31