This is an automated email from the ASF dual-hosted git repository. jmuehlner pushed a commit to branch patch in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit fbf90d51ba1c164b741b3e05b2819a842fd63123 Merge: 2a1698b3 af6a5bb3 Author: James Muehlner <[email protected]> AuthorDate: Thu Mar 14 17:06:36 2024 +0000 Merge 1.5.5 changes back to patch. src/guacenc/ffmpeg-compat.c | 4 ++-- src/guacenc/ffmpeg-compat.h | 4 ++-- src/guacenc/video.c | 4 ++-- src/libguac/Makefile.am | 2 +- src/protocols/rdp/client.c | 19 ++++++++++++++----- src/protocols/rdp/input.c | 14 +++++++------- src/protocols/rdp/keyboard.c | 5 +++-- src/protocols/rdp/rdp.c | 28 ++++++++++++++++++++++------ src/protocols/rdp/rdp.h | 4 ++-- 9 files changed, 55 insertions(+), 29 deletions(-)
