Repository: brooklyn-server Updated Branches: refs/heads/0.11.x a99d8639d -> 93b00966a
LICENSE updates (cherry picked from commit 3e3ad6095c54285dd770638b4c3544c215ecc8f9) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/93b00966 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/93b00966 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/93b00966 Branch: refs/heads/0.11.x Commit: 93b00966a412af2dc568239c6d9275171e8980ff Parents: 1dffe66 Author: Richard Downer <[email protected]> Authored: Tue Apr 11 21:10:15 2017 +0100 Committer: Richard Downer <[email protected]> Committed: Tue Apr 11 21:47:49 2017 +0100 ---------------------------------------------------------------------- LICENSE | 4 ++-- server-cli/src/main/license/files/LICENSE | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/93b00966/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 22142e1..f01776f 100644 --- a/LICENSE +++ b/LICENSE @@ -230,7 +230,7 @@ This project includes the software: Font Awesome (code) This project includes the software: Font Awesome (fonts) Available at: http://fontawesome.io/ - Inclusive of: font-awesome/fonts/* cluster.svg + Inclusive of: font-awesome/fonts/* Version used: 4.5.0 Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL) Copyright (c) Dave Gandy (2016) @@ -389,7 +389,7 @@ This project includes the software: Swagger UI This project includes the software: Tango Project Icons Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg - Inclusive of: server.svg + Inclusive of: tango-project-icons Used under the following license: Public Domain (https://en.wikipedia.org/wiki/en:public_domain) Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/93b00966/server-cli/src/main/license/files/LICENSE ---------------------------------------------------------------------- diff --git a/server-cli/src/main/license/files/LICENSE b/server-cli/src/main/license/files/LICENSE index 9e1284e..f8841ee 100644 --- a/server-cli/src/main/license/files/LICENSE +++ b/server-cli/src/main/license/files/LICENSE @@ -196,14 +196,14 @@ Contents: This project includes the software: Font Awesome (fonts) Available at: http://fontawesome.io/ - Inclusive of: font-awesome/fonts/* cluster.svg + Inclusive of: font-awesome/fonts/* Version used: 4.5.0 Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL) Copyright (c) Dave Gandy (2016) This project includes the software: Tango Project Icons Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg - Inclusive of: server.svg + Inclusive of: tango-project-icons Used under the following license: Public Domain (https://en.wikipedia.org/wiki/en:public_domain) Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons
