summaryrefslogtreecommitdiff
path: root/ui/vnc-ws.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-03 12:43:03 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-10-03 12:43:03 +0100
commitbe9d199751789fdc96a3febe3f0768f1338d87ca (patch)
tree171e1c4d8583033ec3d9745f7f405a51f44f259a /ui/vnc-ws.c
parentab161529261928ae7f3556e3220829c34b2686ec (diff)
parent36ac78e65a0695f0e397865cceaf4ab5c4e52c64 (diff)
downloadqemu-be9d199751789fdc96a3febe3f0768f1338d87ca.tar.gz
Merge remote-tracking branch 'remotes/famz/tags/docker-testing-pull-request' into staging
# gpg: Signature made Fri 29 Sep 2017 04:17:37 BST # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # 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: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-testing-pull-request: docker: Don't mount ccache db if NOUSER=1 docker: test-block: Don't continue if build fails tests/docker/run: don't source /etc/profile docker: Fix test-mingw docker: add installation to build tests Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc-ws.c')
0 files changed, 0 insertions, 0 deletions