Merge client cleanup fix.

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

Branch: refs/heads/master
Commit: 055aa1b059fa15ea0bc1eafbcacc36da5f8bfc68
Parents: c7bf4f7 a64c3e0
Author: James Muehlner <[email protected]>
Authored: Mon May 23 20:36:55 2016 -0700
Committer: James Muehlner <[email protected]>
Committed: Mon May 23 20:36:55 2016 -0700

----------------------------------------------------------------------
 src/protocols/rdp/rdp.c | 19 ++++++++++++++++---
 src/protocols/ssh/ssh.c |  5 ++++-
 src/protocols/vnc/vnc.c | 13 +++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to