]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging
authorPeter Maydell <[email protected]>
Mon, 29 Feb 2016 11:49:50 +0000 (11:49 +0000)
committerPeter Maydell <[email protected]>
Mon, 29 Feb 2016 11:49:50 +0000 (11:49 +0000)
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) <[email protected]>"
# gpg:                 aka "Gerd Hoffmann <[email protected]>"
# gpg:                 aka "Gerd Hoffmann (private) <[email protected]>"

* 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 <[email protected]>

Trivial merge
This page took 0.024842 seconds and 4 git commands to generate.