From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 22 Mar 2016 20:27:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ffa6564c9b13cea4b704e184d29d721f2cb061bb;p=qemu.git

Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging

wxx patch queue

# gpg: Signature made Tue 22 Mar 2016 18:18:36 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20160322:
  wxx: Add support for ncurses
  Remove unneeded include statements for setjmp.h
  Include setjmp.h in qemu/osdep.h (bug fix for w64)

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

ffa6564c9b13cea4b704e184d29d721f2cb061bb