| commit | 382e1737d3467b76e8ade34b96afaae91509002e | |
| author | Gerd Hoffmann <kraxel@redhat.com> | |
| Thu, 5 Nov 2015 09:12:18 +0000 (5 10:12 +0100) | ||
| committer | Gerd Hoffmann <kraxel@redhat.com> | |
| Thu, 5 Nov 2015 15:01:37 +0000 (5 16:01 +0100) | ||
| tree | 8b8d165aae6cc423987e1e23615f96a70c9d4a26 | treesnapshot (tar.gz zip) |
| parent | f14c3d85b003d8614144ae67a26157667c1e1245 | commitdiff |
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
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
| ui/vnc.c | diffblobblamehistory |