You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2015/01/07 11:31:47 UTC

git commit: [flex-sdk] [refs/heads/develop] - added Saxon9 changes to LICENSE and NOTICE

Repository: flex-sdk
Updated Branches:
  refs/heads/develop 395116b73 -> b3cf8fed1


added Saxon9 changes to LICENSE and NOTICE


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b3cf8fed
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b3cf8fed
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b3cf8fed

Branch: refs/heads/develop
Commit: b3cf8fed10cdc9389e8cd29f5c1e8f0493f859d6
Parents: 395116b
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Jan 6 08:36:58 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Jan 7 11:31:36 2015 +0100

----------------------------------------------------------------------
 LICENSE.bin | 19 +++++++++++++++++++
 NOTICE.bin  |  4 ++++
 2 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3cf8fed/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 71a9616..3702275 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -67,6 +67,23 @@ specified in an individual module.
 Portions created by other named contributors are copyright as identified in the relevant 
 module. All Rights Reserved.
 
+ Copyright 1999 CERN - European Organization for Nuclear Research.<br/><br/>
+
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose
+is hereby granted without fee, provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear in supporting documentation.
+CERN makes no representations about the suitability of this software for any purpose.
+It is provided "as is" without expressed or implied warranty.
+
+This product bundles software available under a
+BSD software license. For details, see lib/external/THAI.txt
+
+This product bundles software available under a
+MIT software license. For details, see lib/external/UNICODE.txt
+
+This product bundles software available under a
+MIT software license. For details, see lib/external/JAMESCLARK.txt
+
 ------------------------------------------------------------------------------------------
 
 lib/external/xml-apis.jar
@@ -105,3 +122,5 @@ Apache Software License, Version 1.1. For details,
 see lib/external/LICENSE.dom-software.txt
 
 ------------------------------------------------------------------------------------------
+
+

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3cf8fed/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index cdf499e..beb0cd3 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -42,4 +42,8 @@
      - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
      - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
      - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+     
+    Portions of SAxon9 are derived from classes placed in the
+	public domain by Arbortext on 10 Apr 2000. See:
+		http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm