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

author Pierre Ossman <ossman@cendio.se>

Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)

committer Pierre Ossman <ossman@cendio.se>

Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)
author Pierre Ossman <ossman@cendio.se>
Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)
committer Pierre Ossman <ossman@cendio.se>
Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)
diff --cc vncviewer/CMakeLists.txt
Simple merge
diff --cc vncviewer/OptionsDialog.cxx
Simple merge
diff --cc vncviewer/Viewport.cxx
Simple merge
author	Pierre Ossman <ossman@cendio.se>
	Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)
committer	Pierre Ossman <ossman@cendio.se>
	Thu, 22 Dec 2022 12:43:02 +0000 (13:43 +0100)
		1	2
vncviewer/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
vncviewer/OptionsDialog.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
vncviewer/Viewport.cxx	patch \|	diff1 \|	diff2 \|	blob \| history