incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [03/50] git commit: [#6422] Added missed 3rd-party lib to LICENSE and changed verbiage
Date Mon, 21 Oct 2013 21:04:37 GMT
[#6422] Added missed 3rd-party lib to LICENSE and changed verbiage

Signed-off-by: Cory Johns <cjohns@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/fa7d33e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/fa7d33e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/fa7d33e9

Branch: refs/heads/cj/6686
Commit: fa7d33e9599b8f2ad2972791afdae871343ab63b
Parents: 1c9afc6
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Wed Sep 18 19:30:24 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Wed Oct 9 15:24:25 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/fa7d33e9/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/fa7d33e9/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


Mime
View raw message