summary refs log tree commit diff stats
path: root/hw/intc/omap_intc.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-04-27 19:06:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-04-27 19:06:08 +0100
commit3f9d69ba12da6f2874631f6e426a7ef148ba4c82 (patch)
treee6930403420136db38882edfd320e2185c8bd1f0 /hw/intc/omap_intc.c
parent0d81cdddaa40a1988b24657aeac19959cfad0fde (diff)
parent1a01716a307387e5cf1336f61a96f772dddadc90 (diff)
downloadfocaccia-qemu-3f9d69ba12da6f2874631f6e426a7ef148ba4c82.tar.gz
focaccia-qemu-3f9d69ba12da6f2874631f6e426a7ef148ba4c82.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150427-1' into staging
gtk: support text consoles without vte, bugfixes.

# gpg: Signature made Mon Apr 27 14:34:15 2015 BST 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-gtk-20150427-1:
  gtk: Avoid accel key leakage into guest on console switch
  gtk: Fix VTE focus grabbing
  console/gtk: add qemu_console_get_label
  gtk: bind to text terminal consoles too
  gtk: handle switch_surface(NULL) properly

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc/omap_intc.c')
0 files changed, 0 insertions, 0 deletions