You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/05/07 21:11:27 UTC

[guacamole-server] 01/01: Merge staging/1.2.0 changes back to master.

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

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

commit a0e11dc81727528224d28466903454e1cb0266bb
Merge: 9c37fc5 0bf65ce
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu May 7 14:10:33 2020 -0700

    Merge staging/1.2.0 changes back to master.

 .../channels/rdpdr/rdpdr-fs-messages-file-info.c   | 35 +++++++++
 .../rdp/channels/rdpdr/rdpdr-fs-messages.c         | 84 +++++++++++++++++++++-
 src/protocols/rdp/channels/rdpdr/rdpdr-messages.c  | 50 +++++++++++++
 src/protocols/rdp/channels/rdpdr/rdpdr-printer.c   | 16 +++++
 src/protocols/rdp/channels/rdpdr/rdpdr.c           | 11 +++
 .../rdp/channels/rdpsnd/rdpsnd-messages.c          | 54 ++++++++++++++
 src/protocols/rdp/channels/rdpsnd/rdpsnd.c         | 10 ++-
 .../rdp/plugins/guac-common-svc/guac-common-svc.c  |  5 ++
 src/protocols/rdp/plugins/guacai/guacai-messages.c | 52 ++++++++++++--
 src/protocols/rdp/plugins/guacai/guacai.c          | 10 ++-
 10 files changed, 320 insertions(+), 7 deletions(-)