[guacamole-server] branch master updated (cc68848 -> f47491e)

[vn...@apache.org]

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

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


    from cc68848  Merge staging/1.2.0 changes back to master.
     add 789463c  GUACAMOLE-978: Respond to Handshake/HandshakeEx PDU received via RAIL with client Handshake PDU.
     add 253213b  GUACAMOLE-978: Merge respond to Handshake/HandshakeEx PDU received via RAIL with client Handshake PDU.
     add 5e1b92c  GUACAMOLE-979: Ensure all FreeRDP settings strings are independent duplicates of their corresponding Guacamole settings.
     add e440716  GUACAMOLE-979: Merge ensure all FreeRDP settings strings are independent duplicates of their corresponding Guacamole settings.
     new f47491e  Merge staging/1.2.0 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

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

[vn...@apache.org]

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(-)