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/2c2824fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/2c2824fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/2c2824fc Branch: refs/heads/master Commit: 2c2824fc5b2cde055d072c3c512c551f32eb7de6 Parents: 1d5d878 145762a Author: James Muehlner <[email protected]> Authored: Mon Mar 13 22:13:10 2017 -0700 Committer: James Muehlner <[email protected]> Committed: Mon Mar 13 22:13:10 2017 -0700 ---------------------------------------------------------------------- src/common/common/cursor.h | 5 +- src/common/cursor.c | 162 ++++++++-------------------------- src/libguac/guacamole/protocol.h | 20 +++++ src/libguac/protocol.c | 17 ++++ src/terminal/terminal.c | 1 - 5 files changed, 74 insertions(+), 131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/2c2824fc/src/terminal/terminal.c ----------------------------------------------------------------------
