diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-11-05 10:12:18 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-11-05 16:01:37 +0100 |
| commit | 382e1737d3467b76e8ade34b96afaae91509002e (patch) | |
| tree | 8b8d165aae6cc423987e1e23615f96a70c9d4a26 /hw/net/vmxnet_tx_pkt.h | |
| parent | f14c3d85b003d8614144ae67a26157667c1e1245 (diff) | |
| download | hqemu-382e1737d3467b76e8ade34b96afaae91509002e.zip hqemu-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 'hw/net/vmxnet_tx_pkt.h')
0 files changed, 0 insertions, 0 deletions
