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 547604b3afb4f64ef22f48219ebd7d8c32e6ee1f
Merge: 13c9fe1e 483a0863
Author: Michael Jumper <[email protected]>
AuthorDate: Fri Mar 7 15:10:37 2025 -0800

    Merge changes from main branch back to next.

 src/common/clipboard.c                |  6 ++---
 src/common/common/clipboard.h         | 44 ++++++++++++++++++++++++---------
 src/protocols/kubernetes/kubernetes.c |  1 +
 src/protocols/kubernetes/settings.c   | 27 ++++++++++++++++++++
 src/protocols/kubernetes/settings.h   |  5 ++++
 src/protocols/rdp/channels/cliprdr.c  | 20 +++++++++------
 src/protocols/rdp/channels/cliprdr.h  |  5 +++-
 src/protocols/rdp/client.c            |  3 ---
 src/protocols/rdp/settings.c          | 27 ++++++++++++++++++++
 src/protocols/rdp/settings.h          |  5 ++++
 src/protocols/rdp/user.c              |  4 +++
 src/protocols/ssh/settings.c          | 28 +++++++++++++++++++++
 src/protocols/ssh/settings.h          |  5 ++++
 src/protocols/ssh/ssh.c               |  1 +
 src/protocols/telnet/settings.c       | 28 +++++++++++++++++++++
 src/protocols/telnet/settings.h       |  5 ++++
 src/protocols/telnet/telnet.c         |  1 +
 src/protocols/vnc/client.c            |  3 ---
 src/protocols/vnc/clipboard.c         | 46 +++++++++++++++++++++++++++--------
 src/protocols/vnc/settings.c          | 28 +++++++++++++++++++++
 src/protocols/vnc/settings.h          |  5 ++++
 src/protocols/vnc/user.c              |  4 +++
 src/terminal/terminal.c               | 10 +++++---
 src/terminal/terminal/terminal.h      |  5 ++++
 24 files changed, 275 insertions(+), 41 deletions(-)

Reply via email to