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/03/02 23:39:07 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 f47491eaca49b5387748002113adad513a2c5cfc
Merge: cc68848 e440716
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Mon Mar 2 18:38:03 2020 -0500

    Merge staging/1.2.0 changes back to master.

 src/protocols/rdp/channels/rail.c | 32 +++++++++++++++++++++++++-------
 src/protocols/rdp/settings.c      |  6 +++---
 2 files changed, 28 insertions(+), 10 deletions(-)