Merge branch 'covscan' of https://github.com/grulja/tigervnc

author Pierre Ossman <ossman@cendio.se>

Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)

committer Pierre Ossman <ossman@cendio.se>

Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)
author Pierre Ossman <ossman@cendio.se>
Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)
committer Pierre Ossman <ossman@cendio.se>
Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)
diff --cc common/rfb/CSecurityTLS.cxx
Simple merge
diff --cc unix/xserver/hw/vnc/vncExtInit.cc
Simple merge
diff --cc unix/xserver/hw/vnc/xvnc.c
Simple merge
diff --cc vncviewer/vncviewer.cxx
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)
committer	Pierre Ossman <ossman@cendio.se>
	Wed, 21 Nov 2018 15:02:31 +0000 (16:02 +0100)
		1	2
common/rfb/CSecurityTLS.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
unix/xserver/hw/vnc/vncExtInit.cc	patch \|	diff1 \|	diff2 \|	blob \| history
unix/xserver/hw/vnc/xvnc.c	patch \|	diff1 \|	diff2 \|	blob \| history
vncviewer/vncviewer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history