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/332e1878 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/332e1878 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/332e1878 Branch: refs/heads/master Commit: 332e187813595fc2e769f3e29c0582b7ec726ea1 Parents: 911e60c a1ba91b Author: Nick Couchman <vn...@apache.org> Authored: Fri Aug 24 12:17:20 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Aug 24 12:17:20 2018 -0400 ---------------------------------------------------------------------- src/terminal/named-colors.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
