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 2020/06/09 17:43:30 UTC

[guacamole-server] branch master updated (b6568d1 -> b8ecfe2)

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


    from b6568d1  Merge 1.2.0 changes back to master.
     add 0c59897  GUACAMOLE-513: New defaults header needs to be in Makefile.am
     add 9ca382e  GUACAMOLE-513: Merge addition of new defaults.h header to Makefile.am.
     new b8ecfe2  Merge 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/common/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

[guacamole-server] 01/01: Merge 1.2.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-server.git

commit b8ecfe2425013e0f83b74fa4e2d404ebd9154c4f
Merge: b6568d1 9ca382e
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Tue Jun 9 10:43:10 2020 -0700

    Merge 1.2.0 changes back to master.

 src/common/Makefile.am | 1 +
 1 file changed, 1 insertion(+)