Merge 0.9.14 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/5295886f Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/5295886f Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/5295886f Branch: refs/heads/master Commit: 5295886f68bceb5fcf2a7260b2b65c4705d0250a Parents: f72de10 7c191d7 Author: Nick Couchman <[email protected]> Authored: Mon Jan 1 16:27:03 2018 -0500 Committer: Nick Couchman <[email protected]> Committed: Mon Jan 1 16:27:03 2018 -0500 ---------------------------------------------------------------------- .gitignore | 1 + Makefile.am | 16 +-- bin/guacctl | 2 +- configure.ac | 6 +- doc/Doxyfile | 60 ---------- doc/Doxyfile.in | 60 ++++++++++ src/guacd/.gitignore | 4 + src/guacd/Makefile.am | 8 +- src/guacd/man/guacd.8 | 118 ------------------- src/guacd/man/guacd.8.in | 115 +++++++++++++++++++ src/guacd/man/guacd.conf.5 | 181 ----------------------------- src/guacd/man/guacd.conf.5.in | 178 +++++++++++++++++++++++++++++ src/guacenc/.gitignore | 3 + src/guacenc/Makefile.am | 4 +- src/guacenc/man/guacenc.1 | 80 ------------- src/guacenc/man/guacenc.1.in | 77 +++++++++++++ src/guaclog/guaclog | 228 +++++++++++++++++++++++++++++++++++++ src/libguac/Makefile.am | 2 +- 18 files changed, 687 insertions(+), 456 deletions(-) ----------------------------------------------------------------------
