You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/02/25 03:51:21 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.

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

commit 811d2f70e450d3d461afb1b8469528fb1f2d0383
Merge: 090bb3b 83d2f30
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Mon Feb 24 22:50:10 2020 -0500

    Merge staging/1.2.0 changes back to master.

 configure.ac                 | 15 +++++++
 src/common-ssh/sftp.c        | 11 +++--
 src/protocols/rdp/gdi.c      | 95 ++++++++++++++++++++++++++++++++++++++++++++
 src/protocols/rdp/gdi.h      | 39 ++++++++++++++++++
 src/protocols/rdp/rdp.c      |  2 +
 src/protocols/rdp/settings.c |  5 +++
 6 files changed, 161 insertions(+), 6 deletions(-)