Merge 0.9.12-incubating changes back to master.

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/cd8646b3
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/cd8646b3
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/cd8646b3

Branch: refs/heads/master
Commit: cd8646b38f77feb3f829c7caa10dead8be41ee41
Parents: 0ea9582 a7ee5ed
Author: James Muehlner <james.muehl...@guac-dev.org>
Authored: Wed Feb 15 20:53:17 2017 -0800
Committer: James Muehlner <james.muehl...@guac-dev.org>
Committed: Wed Feb 15 20:53:17 2017 -0800

----------------------------------------------------------------------
 src/protocols/rdp/Makefile.am                |   3 +
 src/protocols/rdp/client.c                   |   1 +
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.c | 368 ++----------
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.h |  31 --
 src/protocols/rdp/rdp.c                      |   7 +
 src/protocols/rdp/rdp.h                      |   6 +
 src/protocols/rdp/rdp_print_job.c            | 651 ++++++++++++++++++++++
 src/protocols/rdp/rdp_print_job.h            | 235 ++++++++
 8 files changed, 947 insertions(+), 355 deletions(-)
----------------------------------------------------------------------


Reply via email to