[3/3] guacamole-server git commit: Merge 1.0.0 changes back to master.

2018-10-16 Thread mjumper 
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/6f491946
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/6f491946
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/6f491946

Branch: refs/heads/master
Commit: 6f491946408224a231324663938df36c756b09d2
Parents: f8d2bd1 0ffda8a
Author: Michael Jumper 
Authored: Tue Oct 16 09:05:37 2018 -0700
Committer: Michael Jumper 
Committed: Tue Oct 16 09:05:37 2018 -0700

--
 src/protocols/vnc/settings.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--

[3/3] guacamole-server git commit: Merge 1.0.0 changes back to master.

2018-08-24 Thread vnick 
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 
Authored: Fri Aug 24 12:17:20 2018 -0400
Committer: Nick Couchman 
Committed: Fri Aug 24 12:17:20 2018 -0400

--
 src/terminal/named-colors.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--

[3/3] guacamole-server git commit: Merge 1.0.0 changes back to master.

2018-07-05 Thread mjumper 
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/83f8dd50
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/83f8dd50
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/83f8dd50

Branch: refs/heads/master
Commit: 83f8dd50dfbb49ec98ec12607e89aa9e10ac5a27
Parents: 35237a4 f980d4b
Author: Michael Jumper 
Authored: Thu Jul 5 14:42:15 2018 -0700
Committer: Michael Jumper 
Committed: Thu Jul 5 14:42:15 2018 -0700

--
 src/libguac/guacamole/parser-constants.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--