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

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

commit 52f57b7ba7911a491f15eeba92ebc84661d244c0
Merge: 4b7d4fc9 718cdff1
Author: Michael Jumper <[email protected]>
AuthorDate: Fri Oct 17 03:41:45 2025 -0700

    Merge changes from main branch back to next.

 src/protocols/kubernetes/kubernetes.c |  1 +
 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               |  1 +
 src/protocols/telnet/settings.c       | 12 ++++++
 src/protocols/telnet/settings.h       |  6 +++
 src/protocols/telnet/telnet.c         |  1 +
 src/terminal/terminal-handlers.c      | 12 ++++++
 src/terminal/terminal.c               | 74 ++++++++++++++++++++++++++++++++---
 src/terminal/terminal/terminal-priv.h | 12 ++++++
 src/terminal/terminal/terminal.h      | 24 ++++++++++++
 13 files changed, 173 insertions(+), 6 deletions(-)

Reply via email to