You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by jm...@apache.org on 2020/01/22 07:31:06 UTC

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

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

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

commit 28f7d3694e7be0bee4b4deb1cbf5e2a48b8f275b
Merge: a447b3d 3bc00c4
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Tue Jan 21 23:30:04 2020 -0800

    Merge 1.1.0 changes back to master.

 configure.ac                   |  24 +++++++
 src/libguac/audio.c            |   9 +++
 src/libguac/guacamole/audio.h  |   3 +-
 src/libguac/guacamole/client.h |   3 +-
 src/libguac/guacamole/user.h   |   8 ++-
 src/protocols/rdp/Makefile.am  |   2 +
 src/protocols/rdp/beep.c       | 147 +++++++++++++++++++++++++++++++++++++++++
 src/protocols/rdp/beep.h       |  65 ++++++++++++++++++
 src/protocols/rdp/bitmap.c     |   9 ++-
 src/protocols/rdp/client.c     |  59 ++++++++++++++++-
 src/protocols/rdp/rdp.c        |   4 ++
 11 files changed, 325 insertions(+), 8 deletions(-)