summaryrefslogtreecommitdiff
path: root/readlicense_oo
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-10-10 17:42:46 +0200
committerDavid Tardon <dtardon@redhat.com>2012-10-25 14:48:23 +0200
commit725eba738eae4eee6cd9b833d375db5463833119 (patch)
treefe9c71e9e3de5c4dd86f9d2d61b8ef2d68787ee2 /readlicense_oo
parentbfc71eb03e2bc6f26d53f70b32f9a8937086808b (diff)
remove all traces of saxon
Change-Id: I33ca2c27d557d24e3900d7ebf8f3ea2d99b3cfb0
Diffstat (limited to 'readlicense_oo')
-rw-r--r--readlicense_oo/html/LICENSE.html14
-rw-r--r--readlicense_oo/txt/NOTICE5
-rw-r--r--readlicense_oo/txt/license.txt14
3 files changed, 1 insertions, 32 deletions
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 7753ed92fddc..6c87f3943f31 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -2110,18 +2110,6 @@ FITNESS FOR A PARTICULAR PURPOSE.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
file declares SANE application interface. See the SANE standard for a
detailed explanation of the interface.</P>
-<H2 CLASS="western">Saxon (B)</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: Saxon (B). Use of
-any of this software is governed by the terms of the license below:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#10.Mozilla Public License Version 1.1|outline">Jump
-to MPL Version 1.1</A></P>
-<H2 CLASS="western">Stax</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: Stax API. Use of
-any of this software is governed by the terms of the license below:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#11.Apache License|outline">Jump
-to Apache License Version 2.0</A></P>
<H2 CLASS="western">STLPort</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
following software may be included in this product:STLport. Use of
@@ -9471,4 +9459,4 @@ this trademark restriction does not form part of the License.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Creative
Commons may be contacted at <A HREF="http://creativecommons.org/">http://creativecommons.org/</A>.</P>
</BODY>
-</HTML> \ No newline at end of file
+</HTML>
diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/txt/NOTICE
index 181aea7be840..8edf0f009aa6 100644
--- a/readlicense_oo/txt/NOTICE
+++ b/readlicense_oo/txt/NOTICE
@@ -139,7 +139,6 @@ As part of the base system this product also includes code from the following
projects which are licensed under the Apache license:
- serf
- redland
-- StAX
The notices from these projects are following:
@@ -153,10 +152,6 @@ This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
-
-StAX
-[no notices]
-
____
This product includes software developed by the OpenSSL Project
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 8e06f1f25286..47ef7f28f0f1 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -2057,20 +2057,6 @@ SANE
This file declares SANE application interface. See the SANE standard
for a detailed explanation of the interface.
-Saxon (B)
-
- The following software may be included in this product: Saxon (B). Use
- of any of this software is governed by the terms of the license below:
-
- See MPL Version 1.1 below
-
-Stax
-
- The following software may be included in this product: Stax API. Use
- of any of this software is governed by the terms of the license below:
-
- See Apache License Version 2.0 below
-
STLPort
The following software may be included in this product:STLport. Use of