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/VNCSConnectionST.h
+++ b/common/rfb/VNCSConnectionST.h
@@ -341,6 +341,7 @@ namespace rfb {
    uint32_t udpFramesSinceFull;

    char unixRelaySubscriptions[MAX_UNIX_RELAYS][MAX_UNIX_RELAY_NAME_LEN];
+    bool complainedAboutNoViewRights;
  };
 }
 #endif