From: Peter Maydell Date: Wed, 22 Oct 2014 12:08:43 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ad089894a8b203593e1d3f77b54fd5a43dc16c5b;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging configure: Prepend pixman and ftd flags to overrule system-provided ones # gpg: Signature made Wed 15 Oct 2014 11:21:13 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-console-20141015-1: configure: Prepend pixman and ftd flags to overrule system-provided ones Signed-off-by: Peter Maydell --- ad089894a8b203593e1d3f77b54fd5a43dc16c5b