Merging 0.9.13-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/bedd09fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bedd09fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bedd09fc Branch: refs/heads/master Commit: bedd09fc104c2c9b8f9e8b76d44482d77eb69473 Parents: 3beedd1 24708cf Author: Nick Couchman <vn...@apache.org> Authored: Sat Jun 3 23:01:50 2017 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Sat Jun 3 23:01:50 2017 -0400 ---------------------------------------------------------------------- doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-cas/pom.xml | 6 +++--- .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 4 ++-- .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++--- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 4 ++-- extensions/guacamole-auth-ldap/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-noauth/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- guacamole-common-js/src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 2 +- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 8 ++++---- pom.xml | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) ----------------------------------------------------------------------