You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/09/18 21:30:59 UTC
[5/5] git commit: [#6422] Added missed 3rd-party lib to LICENSE and
changed verbiage
[#6422] Added missed 3rd-party lib to LICENSE and changed verbiage
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b081c5dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b081c5dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b081c5dd
Branch: refs/heads/cj/6422
Commit: b081c5ddabfddb60809e20d8268fb53eb6ec6fca
Parents: d868636
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Sep 18 19:30:24 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Sep 18 19:30:24 2013 +0000
----------------------------------------------------------------------
Allura/LICENSE | 4 ++++
LICENSE | 14 +++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b081c5dd/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 973fd44..ffb5ecb 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -208,6 +208,10 @@ 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.
+HTML5 Canvas for Internet Explorer, which is available under the
+Apache License, Version 2.0.
+For details, see Allura/allura/public/nf/js/excanvas.compiled.js
+
The file allura/etc/mime.types from the mime-support package,
which is in the public domain. For details, see
http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b081c5dd/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8f47b97..e558325 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,12 +202,16 @@
limitations under the License.
-ALLURA SUBCOMPONENTS:
+THIRD-PARTY DEPENDENCIES:
-Apache Allura includes a number of subcomponents with 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.
+Apache Allura includes a number of third-party dependencies with
+separate copyright notices and license terms. Your use of the source code
+for the these dependencies is subject to the terms and conditions of the
+following licenses.
+
+HTML5 Canvas for Internet Explorer, which is available under the
+Apache License, Version 2.0.
+For details, see Allura/allura/public/nf/js/excanvas.compiled.js
The file Allura/allura/etc/mime.types from the mime-support package,
which is in the public domain. For details, see