This is an automated email from the ASF dual-hosted git repository. necouchman pushed a commit to branch staging/1.6.1 in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 7ca6234a4b921e4f0b191fcb2fcea83218a1b6c5 Merge: 4163ead8 d9b72b33 Author: Virtually Nick <[email protected]> AuthorDate: Tue May 5 11:17:23 2026 -0400 GUACAMOLE-2272: Merge add MacRoman clipboard encoding (server) support for VNC protocol. src/common/common/defaults.h | 8 +- src/common/common/iconv.h | 24 ++ src/common/iconv.c | 514 +++++++++++++++++++++++++++-- src/common/tests/iconv/convert-test-data.c | 40 +++ src/common/tests/iconv/convert-test-data.h | 2 +- src/common/tests/iconv/convert.c | 124 ++++++- src/protocols/vnc/clipboard.c | 44 ++- src/protocols/vnc/clipboard.h | 2 +- src/protocols/vnc/settings.c | 10 +- 9 files changed, 727 insertions(+), 41 deletions(-)
