This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit d71f807db63e9fce6492b62f67621f523bee670d Merge: fae91a9d f9d9dff8 Author: Virtually Nick <[email protected]> AuthorDate: Fri Mar 29 12:33:19 2024 -0400 Merge main branch changes to next. src/protocols/kubernetes/kubernetes.c | 3 ++- src/protocols/kubernetes/settings.c | 12 ++++++++++ src/protocols/kubernetes/settings.h | 6 +++++ src/protocols/ssh/settings.c | 12 ++++++++++ src/protocols/ssh/settings.h | 6 +++++ src/protocols/ssh/ssh.c | 3 ++- src/protocols/telnet/settings.c | 12 ++++++++++ src/protocols/telnet/settings.h | 6 +++++ src/protocols/telnet/telnet.c | 3 ++- src/terminal/terminal.c | 5 +++-- src/terminal/terminal/terminal.h | 25 ++++++++++++++------- src/terminal/terminal/typescript.h | 14 ++++++++---- src/terminal/typescript.c | 41 ++++++++++++++++++++--------------- 13 files changed, 114 insertions(+), 34 deletions(-)
