Merge 0.9.12-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/25b9425e Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/25b9425e Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/25b9425e Branch: refs/heads/master Commit: 25b9425eda0e9eb14e0cd41ff6970af257facb36 Parents: 865ec19 4a0de7f Author: James Muehlner <[email protected]> Authored: Tue Mar 7 17:11:41 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Tue Mar 7 17:11:41 2017 -0800 ---------------------------------------------------------------------- .../src/main/webapp/modules/Display.js | 2 +- .../src/main/webapp/modules/Layer.js | 34 ++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
