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 2019/06/18 01:39:11 UTC

[guacamole-client] branch master updated (1b48f21 -> 5f1c70e)

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

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


    from 1b48f21  merge 1.1.0 changes back to master.
     add f88c3ab  GUACAMOLE-354: Add ch-de-qwertz option for RDP keymap.
     add bc3b7e2  GUACAMOLE-354: Add translation string for CH DE keyboard layout.
     add 19fe85b  GUACAMOLE-354: Correct order of LANG-COUNTRY in keymap names.
     add 82ea1d6  GUACAMOLE-354: Merge translation and definition for Swiss German keymap option.
     new 5f1c70e  Merge 1.1.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:
 guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 +
 guacamole/src/main/webapp/translations/en.json                           | 1 +
 2 files changed, 2 insertions(+)

[guacamole-client] 01/01: Merge 1.1.0 changes back to master.

Posted by mj...@apache.org.

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-client.git

commit 5f1c70e737ca0b0e7726d5df62ef1631eac078d0
Merge: 1b48f21 82ea1d6
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Mon Jun 17 18:38:29 2019 -0700

    Merge 1.1.0 changes back to master.

 guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 +
 guacamole/src/main/webapp/translations/en.json                           | 1 +
 2 files changed, 2 insertions(+)