aboutsummaryrefslogtreecommitdiff
path: root/trace-events
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-11-05 10:12:18 +0100
committerGerd Hoffmann <kraxel@redhat.com>2015-11-05 16:01:37 +0100
commit382e1737d3467b76e8ade34b96afaae91509002e (patch)
tree8b8d165aae6cc423987e1e23615f96a70c9d4a26 /trace-events
parentf14c3d85b003d8614144ae67a26157667c1e1245 (diff)
downloadqemu-arm-382e1737d3467b76e8ade34b96afaae91509002e.tar.gz
vnc: fix mismerge
Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is specified" was rebased incorrectly, fix it. Reported-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn> Message-id: 1446714738-22400-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'trace-events')
0 files changed, 0 insertions, 0 deletions