summaryrefslogtreecommitdiff
path: root/readlicense_oo/license/NOTICE
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2013-12-13 15:09:40 +0000
committerMichael Meeks <michael.meeks@collabora.com>2013-12-13 17:00:07 +0000
commit59197dea293677b55a6f79a6bcfaaa7ce7c8f97b (patch)
treebe113c9aa3858a5b91bd51d93b867bb2c086ded2 /readlicense_oo/license/NOTICE
parent984c3b733fe3b118f6e4b855fa8a6396fe194f8e (diff)
Targetted text updates, with seasonable changes before l10n freeze.
Change-Id: If37ef9f68711da3a0aa9a3ba59b111a8a23421df
Diffstat (limited to 'readlicense_oo/license/NOTICE')
-rw-r--r--readlicense_oo/license/NOTICE8
1 files changed, 5 insertions, 3 deletions
diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE
index 0a4bc388c2dd..975d52e9bdf9 100644
--- a/readlicense_oo/license/NOTICE
+++ b/readlicense_oo/license/NOTICE
@@ -5,8 +5,8 @@ For a more complete license statement please see the associated
documentation
____
-Apache OpenOffice
-Copyright 2011, 2012 The Apache Software Foundation
+Apache OpenOffice (http://www.openoffice.org)
+Copyright 2011, 2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -16,12 +16,14 @@ ____
Portions of this software copyright (c) 2000-2011, Oracle and/or its affiliates <http://www.oracle.com/>.
+Portions of this software (C) Copyright IBM Corporation 2003, 2012. All Rights Reserved.
+
____
As part of the base system this product also includes code from the following
Apache projects:
- Apache Lucene
-- Apache Portable Runtime
+- Apache Portable Runtime
- Apache Portable Runtime Utility Library
- Apache Commons - used by MediaWiki Publisher extension
- Apache Jakarta HttpClient - used by MediaWiki Publisher extension