Repository: syncope Updated Branches: refs/heads/2_0_X 5a07d7e91 -> bfd47df70 refs/heads/master 8f7a7be70 -> bb5bf2961
[SYNCOPE-1145] Adjusting L&N for google-diff-match-patch now used by Admin Console Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bfd47df7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bfd47df7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bfd47df7 Branch: refs/heads/2_0_X Commit: bfd47df70afe3e0ea11d9250f06993ddb7aa7ce8 Parents: 5a07d7e Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Jul 13 12:03:38 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Jul 13 12:03:58 2017 +0200 ---------------------------------------------------------------------- deb/console/LICENSE | 5 +++++ deb/console/NOTICE | 5 +++++ standalone/LICENSE | 5 +++++ standalone/NOTICE | 5 +++++ 4 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/bfd47df7/deb/console/LICENSE ---------------------------------------------------------------------- diff --git a/deb/console/LICENSE b/deb/console/LICENSE index f3ca77a..83ed4dd 100644 --- a/deb/console/LICENSE +++ b/deb/console/LICENSE @@ -658,6 +658,11 @@ This is licensed under the MIT license, see above. == +For google-diff-match-patch (https://code.google.com/archive/p/google-diff-match-patch/): +This is licensed under the AL 2.0, see above. + +== + For Ionicons (http://ionicons.com/): This is licensed under the MIT license, see above. http://git-wip-us.apache.org/repos/asf/syncope/blob/bfd47df7/deb/console/NOTICE ---------------------------------------------------------------------- diff --git a/deb/console/NOTICE b/deb/console/NOTICE index 34b5138..5d3ce0a 100644 --- a/deb/console/NOTICE +++ b/deb/console/NOTICE @@ -48,6 +48,11 @@ Copyright (c) 2013-2016 The JAXB project. == +This product includes software developed by the google-diff-match-patch project. +Copyright (c) 2006 Google Inc. + +== + This product includes software developed by the Ionicons project. Copyright (c) 2016 Drifty (http://drifty.com/) http://git-wip-us.apache.org/repos/asf/syncope/blob/bfd47df7/standalone/LICENSE ---------------------------------------------------------------------- diff --git a/standalone/LICENSE b/standalone/LICENSE index 326f757..ff7aad2 100644 --- a/standalone/LICENSE +++ b/standalone/LICENSE @@ -897,6 +897,11 @@ This is licensed under the MIT license, see above. == +For google-diff-match-patch (https://code.google.com/archive/p/google-diff-match-patch/): +This is licensed under the AL 2.0, see above. + +== + For highlight.js (http://highlightjs.org/): This is licensed under the BSD license: http://git-wip-us.apache.org/repos/asf/syncope/blob/bfd47df7/standalone/NOTICE ---------------------------------------------------------------------- diff --git a/standalone/NOTICE b/standalone/NOTICE index 375498a..30d9b93 100644 --- a/standalone/NOTICE +++ b/standalone/NOTICE @@ -75,6 +75,11 @@ This product includes software developed by the HikariCP project. == +This product includes software developed by the google-diff-match-patch project. +Copyright (c) 2006 Google Inc. + +== + This product includes the Javascript syntax highlighter. Copyright (c) 2006, Ivan Sagalaev
