Merge branch 'types' of https://github.com/CendioOssman/tigervnc

author Pierre Ossman <ossman@cendio.se>

Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)

committer Pierre Ossman <ossman@cendio.se>

Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)
author Pierre Ossman <ossman@cendio.se>
Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)
committer Pierre Ossman <ossman@cendio.se>
Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)
diff --cc common/rfb/SConnection.cxx
Simple merge
diff --cc common/rfb/VNCSConnectionST.cxx
Simple merge
diff --cc unix/x0vncserver/XDesktop.cxx
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)
committer	Pierre Ossman <ossman@cendio.se>
	Thu, 2 Mar 2023 10:09:57 +0000 (11:09 +0100)
		1	2
common/rfb/SConnection.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
common/rfb/VNCSConnectionST.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
unix/x0vncserver/XDesktop.cxx	patch \|	diff1 \|	diff2 \|	blob \| history