You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/12/03 21:04:13 UTC
[12/12] incubator-guacamole-client git commit: Merge
0.9.10-incubating release-specific changes back to master.
Merge 0.9.10-incubating release-specific 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/ef092ba2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ef092ba2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ef092ba2
Branch: refs/heads/master
Commit: ef092ba2dc8ee5764fdc4d0f4129dd719b19c7e3
Parents: c29e6ba 5b7d030
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sat Dec 3 13:03:09 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sat Dec 3 13:03:09 2016 -0800
----------------------------------------------------------------------
.../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +
.../project-assembly.xml | 6 +
.../src/licenses/DISCLAIMER | 7 +
.../src/licenses/LICENSE | 266 +++++++++
.../src/licenses/NOTICE | 5 +
.../src/licenses/bundled/README | 4 +
.../licenses/bundled/aopalliance-1.0/LICENSE | 4 +
.../src/licenses/bundled/guava-18.0/COPYING | 202 +++++++
.../src/licenses/bundled/guice-3.0/COPYING | 202 +++++++
.../bundled/javax.inject-1/LICENSE-2.0.txt | 202 +++++++
.../src/licenses/bundled/mybatis-3.2.8/LICENSE | 202 +++++++
.../src/licenses/bundled/mybatis-3.2.8/NOTICE | 68 +++
.../licenses/bundled/mybatis-guice-3.6/LICENSE | 202 +++++++
.../licenses/bundled/mybatis-guice-3.6/NOTICE | 38 ++
extensions/guacamole-auth-ldap/pom.xml | 1 +
.../guacamole-auth-ldap/src/licenses/DISCLAIMER | 7 +
.../guacamole-auth-ldap/src/licenses/LICENSE | 253 +++++++++
.../guacamole-auth-ldap/src/licenses/NOTICE | 5 +
.../src/licenses/bundled/README | 4 +
.../licenses/bundled/aopalliance-1.0/LICENSE | 4 +
.../src/licenses/bundled/guice-3.0/COPYING | 202 +++++++
.../bundled/javax.inject-1/LICENSE-2.0.txt | 202 +++++++
.../src/licenses/bundled/jldap-4.3/LICENSE | 47 ++
.../licenses/bundled/jldap-4.3/LICENSE-2.0.1 | 56 ++
.../src/main/assembly/dist.xml | 6 +
extensions/guacamole-auth-noauth/pom.xml | 1 +
.../src/licenses/DISCLAIMER | 7 +
.../guacamole-auth-noauth/src/licenses/LICENSE | 203 +++++++
.../guacamole-auth-noauth/src/licenses/NOTICE | 5 +
.../src/main/assembly/dist.xml | 6 +
guacamole/src/licenses/LICENSE | 50 +-
guacamole/src/licenses/bundled/README | 4 +
.../bundled/activation-1.1/CDDLv1.0.text | 119 ++++
.../src/licenses/bundled/angular-1.3.16/LICENSE | 21 +
.../bundled/angular-module-shim-0.0.4/LICENSE | 21 +
.../bundled/angular-translate-2.8.0/LICENSE | 21 +
.../licenses/bundled/aopalliance-1.0/LICENSE | 4 +
guacamole/src/licenses/bundled/asm-3.1/LICENSE | 30 +
.../blob-polyfill-1.0.20150320/LICENSE.md | 25 +
guacamole/src/licenses/bundled/carlito/LICENSE | 95 ++++
.../licenses/bundled/filesaver-1.3.3/LICENSE.md | 11 +
.../src/licenses/bundled/guice-3.0/COPYING | 202 +++++++
.../bundled/jackson-1.9.2/LICENSE-2.0.txt | 202 +++++++
.../bundled/javax.inject-1/LICENSE-2.0.txt | 202 +++++++
.../licenses/bundled/jaxb-api-2.2.2/License.txt | 274 +++++++++
.../bundled/jaxb-impl-2.2.3-1/License.txt | 274 +++++++++
.../licenses/bundled/jersey-1.17.1/LICENSE.txt | 274 +++++++++
.../licenses/bundled/jersey-1.17.1/license.html | 550 +++++++++++++++++++
.../bundled/jettison-1.1/LICENSE-2.0.txt | 202 +++++++
.../bundled/jquery-2.1.3/MIT-LICENSE.txt | 21 +
.../bundled/jsr250-api-1.0/CDDLv1.0.txt | 119 ++++
.../licenses/bundled/lodash-2.4.1/LICENSE.txt | 22 +
.../licenses/bundled/logback-1.1.2/LICENSE.txt | 15 +
.../bundled/messageformat-1.0.2/LICENSE | 20 +
.../bundled/slf4j-api-1.7.7/LICENSE.txt | 24 +
.../bundled/webjars-servlet-2.x-1.1/LICENSE | 21 +
.../dependencies/activation-1.1/CDDLv1.0.text | 119 ----
.../dependencies/angular-1.3.16/LICENSE | 21 -
.../angular-module-shim-0.0.4/LICENSE | 21 -
.../angular-translate-2.8.0/LICENSE | 21 -
.../dependencies/aopalliance-1.0/LICENSE | 4 -
.../src/licenses/dependencies/asm-3.1/LICENSE | 30 -
.../blob-polyfill-1.0.20150320/LICENSE.md | 25 -
.../src/licenses/dependencies/carlito/LICENSE | 95 ----
.../dependencies/filesaver-1.3.3/LICENSE.md | 11 -
.../src/licenses/dependencies/guice-3.0/COPYING | 202 -------
.../dependencies/jackson-1.9.2/LICENSE-2.0.txt | 202 -------
.../dependencies/javax.inject-1/LICENSE-2.0.txt | 202 -------
.../dependencies/jaxb-api-2.2.2/License.txt | 274 ---------
.../dependencies/jaxb-impl-2.2.3-1/License.txt | 274 ---------
.../dependencies/jersey-1.17.1/LICENSE.txt | 274 ---------
.../dependencies/jersey-1.17.1/license.html | 550 -------------------
.../dependencies/jettison-1.1/LICENSE-2.0.txt | 202 -------
.../dependencies/jquery-2.1.3/MIT-LICENSE.txt | 21 -
.../dependencies/jsr250-api-1.0/CDDLv1.0.txt | 119 ----
.../dependencies/lodash-2.4.1/LICENSE.txt | 22 -
.../dependencies/logback-1.1.2/LICENSE.txt | 15 -
.../dependencies/messageformat-1.0.2/LICENSE | 20 -
.../dependencies/slf4j-api-1.7.7/LICENSE.txt | 24 -
.../webjars-servlet-2.x-1.1/LICENSE | 21 -
80 files changed, 5221 insertions(+), 2794 deletions(-)
----------------------------------------------------------------------