[guacamole-server] branch staging/1.2.0 updated (cf845be -> 253213b)

2020-03-02 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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


from cf845be  GUACAMOLE-917: Merge add missing non-dead tilde to German 
keymap for RDP.
 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.

No new revisions were added by this update.

Summary of changes:
 src/protocols/rdp/channels/rail.c | 32 +---
 1 file changed, 25 insertions(+), 7 deletions(-)



[guacamole-server] 01/01: GUACAMOLE-979: Merge ensure all FreeRDP settings strings are independent duplicates of their corresponding Guacamole settings.

2020-03-02 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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

commit e4407167ab57b633a9076d0f3787c4a6b177637e
Merge: 253213b 5e1b92c
Author: Virtually Nick 
AuthorDate: Mon Mar 2 18:36:33 2020 -0500

GUACAMOLE-979: Merge ensure all FreeRDP settings strings are independent 
duplicates of their corresponding Guacamole settings.

 src/protocols/rdp/settings.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



[guacamole-server] branch staging/1.2.0 updated (253213b -> e440716)

2020-03-02 Thread vnick
This is an automated email from the ASF dual-hosted git repository.

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


from 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.
 new e440716  GUACAMOLE-979: Merge ensure all FreeRDP settings strings are 
independent duplicates of their corresponding Guacamole settings.

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/settings.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



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

2020-03-02 Thread vnick
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 
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(-)



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

2020-03-02 Thread vnick
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(-)