GUACAMOLE-351: Merge add "-v" parameter

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

Branch: refs/heads/master
Commit: 329cc9ee48c4a2d1649ccee838107d84c0345a9a
Parents: 05f54d0 3b32737
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Feb 7 22:35:42 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Feb 7 22:35:42 2018 -0500

----------------------------------------------------------------------
 src/guacd/Makefile.am    |  1 +
 src/guacd/conf-args.c    | 12 +++++--
 src/guacd/conf-args.h    |  2 +-
 src/guacd/conf-file.c    |  2 ++
 src/guacd/conf-file.h    | 46 +-------------------------
 src/guacd/conf-parse.c   |  1 +
 src/guacd/conf.h         | 77 +++++++++++++++++++++++++++++++++++++++++++
 src/guacd/daemon.c       | 10 +++++-
 src/guacd/man/guacd.8.in |  6 ++++
 9 files changed, 107 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


Reply via email to