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

author Pierre Ossman <ossman@cendio.se>

Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)

committer Pierre Ossman <ossman@cendio.se>

Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)
author Pierre Ossman <ossman@cendio.se>
Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)
committer Pierre Ossman <ossman@cendio.se>
Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)
diff --cc common/rdr/FdOutStream.cxx
Simple merge
diff --cc vncviewer/CConn.cxx
Simple merge
diff --cc vncviewer/Viewport.cxx
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)
committer	Pierre Ossman <ossman@cendio.se>
	Fri, 30 Jun 2023 20:33:47 +0000 (22:33 +0200)
		1	2
common/rdr/FdOutStream.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vncviewer/CConn.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vncviewer/Viewport.cxx	patch \|	diff1 \|	diff2 \|	blob \| history