rebase and fix merge conflicts

2023-06-30 12:51:01 -04:00
parent 3bae812364 9450157af1
commit 75c51c1e93
99 changed files with 2467 additions and 329 deletions
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -257,6 +257,8 @@ namespace rfb {

    bool getComparerState();

+    void updateWatermark();
+
    QueryConnectionHandler* queryConnectionHandler;
    KeyRemapper* keyRemapper;