This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 084ddaf81f5c29d6cf8871fffe4e8353b10cfca8 Merge: 27db57f be9041f Author: Virtually Nick <[email protected]> AuthorDate: Sat Dec 25 10:21:40 2021 -0500 Merge 1.4.0 changes back to master. src/common/common/iconv.h | 48 +++++++++ src/common/iconv.c | 114 ++++++++++++++++++++ src/common/tests/Makefile.am | 4 + src/common/tests/iconv/convert-test-data.c | 153 +++++++++++++++++++++++++++ src/common/tests/iconv/convert-test-data.h | 121 +++++++++++++++++++++ src/common/tests/iconv/convert.c | 164 ++++++++++------------------- src/protocols/rdp/channels/cliprdr.c | 20 ++-- src/protocols/rdp/settings.c | 42 +++++++- src/protocols/rdp/settings.h | 13 +++ 9 files changed, 559 insertions(+), 120 deletions(-)
