Commit 6ea04339 for guacamole.apache.org

commit 6ea0433907a499de5acff379649690255f7aa29f
Merge: 8925e510 969b66f8
Author: Virtually Nick <vnick@apache.org>
Date:   Sun Jul 12 22:48:04 2026 -0400

    Merge patch branch changes to main.

diff --cc src/protocols/telnet/settings.c
index 20ba07f9,8368bcd3..7afa9b9d
--- a/src/protocols/telnet/settings.c
+++ b/src/protocols/telnet/settings.c
@@@ -17,11 -17,8 +17,9 @@@
   * under the License.
   */

- #include "config.h"
-
  #include "argv.h"
  #include "common/defaults.h"
 +#include "common/clipboard.h"
  #include "settings.h"
  #include "terminal/terminal.h"