This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit 5294c0de91766c2cf4accdd6c362720130fb1642
Merge: 72148919 c802cdce
Author: Virtually Nick <[email protected]>
AuthorDate: Tue May 5 13:50:15 2026 -0400

    Merge main branch changes to next.

 Dockerfile                                 |   2 +-
 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              |  34 +-
 src/protocols/vnc/clipboard.h              |   2 +-
 src/protocols/vnc/settings.c               |  10 +-
 10 files changed, 722 insertions(+), 38 deletions(-)

Reply via email to