Merge 1.0.0 changes back to master.

Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/0062f61d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/0062f61d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/0062f61d

Branch: refs/heads/master
Commit: 0062f61d67163537929d699541356cdce3b36519
Parents: d8cb221 427c4c8
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Jul 31 08:12:30 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Jul 31 08:12:30 2018 -0400

----------------------------------------------------------------------
 src/common/clipboard.c           | 28 ++++++++++++++++++++++++++--
 src/common/common/clipboard.h    |  8 ++++++++
 src/protocols/ssh/client.c       |  5 +++++
 src/protocols/ssh/client.h       |  5 +++++
 src/protocols/ssh/clipboard.c    |  5 +++--
 src/protocols/ssh/ssh.c          |  2 +-
 src/protocols/ssh/ssh.h          |  6 ++++++
 src/protocols/telnet/client.c    |  4 ++++
 src/protocols/telnet/client.h    |  5 +++++
 src/protocols/telnet/clipboard.c |  5 +++--
 src/protocols/telnet/telnet.c    |  1 +
 src/protocols/telnet/telnet.h    |  6 ++++++
 src/terminal/terminal.c          | 16 ++--------------
 src/terminal/terminal/terminal.h | 29 ++++++++++++-----------------
 14 files changed, 87 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/0062f61d/src/terminal/terminal.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/0062f61d/src/terminal/terminal/terminal.h
----------------------------------------------------------------------

Reply via email to