]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170913-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Sep 2017 12:44:17 +0000 (13:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Sep 2017 12:44:17 +0000 (13:44 +0100)
commit0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7
treea78392b7d1b0433162c0d0aff74db6f39613a4df
parentbcf9e2c0a5f8de395842e034ca15be13d1fc5f90
parent7c336f9fe53b1a500f21241841c7bf4267c7ee14
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170913-pull-request' into staging

ui: console fixes
drop pixman submodule

# gpg: Signature made Wed 13 Sep 2017 09:40:34 BST
# 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/ui-20170913-pull-request:
  console: add question-mark escape operator
  console: fix dpy_gfx_replace_surface assert
  pixman: drop configure switches
  pixman: drop submodule

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>