You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/08/10 10:50:00 UTC
incubator-corinthia git commit: Changed LICENSE, NOTICE as pr. advice
Repository: incubator-corinthia
Updated Branches:
refs/heads/Release_0.1 f1843236f -> ef2636583
Changed LICENSE, NOTICE as pr. advice
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/ef263658
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/ef263658
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/ef263658
Branch: refs/heads/Release_0.1
Commit: ef263658304ffa5c2b108bd20cb0f6961e39d83b
Parents: f184323
Author: jani <ja...@apache.org>
Authored: Mon Aug 10 10:47:43 2015 +0200
Committer: jani <ja...@apache.org>
Committed: Mon Aug 10 10:47:43 2015 +0200
----------------------------------------------------------------------
LICENSE.txt | 11 +++++++++++
NOTICE.txt | 16 ----------------
2 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ef263658/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 78f3ddc..6d3f49b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -208,3 +208,14 @@ separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
+- included in source with modifications:
+w3c-tidy-html5 (WC3/BSD like license, see DocFormats\platform\3rdparty\w3c-tidy-html5)
+
+- Link dependency (binary version), not included in the release:
+libxml2 (MIT license)
+SDL2 (zlib license)
+SDL2_image (zlib license)
+zlib (zlib license)
+jquery.js (MIT license)
+
+
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ef263658/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9a014e7..b3b97ba 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -6,19 +6,3 @@ The Apache Software Foundation (http://www.apache.org/).
This product includes software copyright 2011-2015 UX Productivity Pty Ltd.
-
----
-As part of the base system this product also includes the following third
-party libraries:
-
-w3c-tidy-html5, (DocFormats/platform/3rdparty/w3c-tidy-html5/license.html)
-
-And link with the following 3rdparty libraries:
-iconv
-libxmml2
-SDL2
-SDL2_image
-zlib
-
-
-