summary refs log tree commit diff stats
path: root/ui/spice-input.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-29 11:49:50 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-29 11:49:50 +0000
commit1da90c34c9e76e0f4fa9faaa670518443b9bda9c (patch)
treeb7395db1b80ce9eb9634f77e0b3807545e54e0a6 /ui/spice-input.c
parent3ff430aa91f33388cce88d81edcad8b2ac5a7a9f (diff)
parente220656ce1bd98b482d12ef51344aa46aca4e098 (diff)
downloadfocaccia-qemu-1da90c34c9e76e0f4fa9faaa670518443b9bda9c.tar.gz
focaccia-qemu-1da90c34c9e76e0f4fa9faaa670518443b9bda9c.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging
ui: spice dmabuf fix, MAINTAINERS updates.

# gpg: Signature made Mon 29 Feb 2016 10:41:15 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-ui-20160229-1:
  MAINTAINERS: Add an entry for the include/ui/ folder
  MAINTAINERS: Add spice-display.h to the SPICE section
  spice/gl: Enable dmabuf only for spice >= 0.13.1

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