diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-09-09 04:09:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-09-09 04:09:30 +0000 |
| commit | 77e54c3cf0501fcdc69c0fe531150aa7842c8ae7 (patch) | |
| tree | 58582cf3b7b6d4d925b9e38857a0fe1448768eb6 /readlicense_oo | |
| parent | bae114d79426c7f52691e1e8bc8e96175b28b81a (diff) | |
INTEGRATION: CWS ooo19126 (1.2.46); FILE MERGED
2005/09/05 14:40:49 mh 1.2.46.2: update license text, #i54228#
2005/09/05 13:17:45 rt 1.2.46.1: #i54170# Change license header: remove SISSL
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/source/license/unx/LICENSE_en-US.html | 13 | ||||
| -rw-r--r-- | readlicense_oo/source/license/wnt/license_en-US.html | 11 |
2 files changed, 8 insertions, 16 deletions
diff --git a/readlicense_oo/source/license/unx/LICENSE_en-US.html b/readlicense_oo/source/license/unx/LICENSE_en-US.html index 99406eb755b4..b99d1ee6eabc 100644 --- a/readlicense_oo/source/license/unx/LICENSE_en-US.html +++ b/readlicense_oo/source/license/unx/LICENSE_en-US.html @@ -6,14 +6,11 @@ </HEAD> <BODY LANG="en-US"> <H1>(License text)</H1> -<P>You may only copy and distribute this program consistent with the -requirements and distribute this Program consistent with the -requirements of either the GNU General Public License (GPL) and GNU -Lesser General Public License (LGPL) or the Sun Industry Standards -Source License (SISSL), respectively, depending on whether you -elected to obtain access to this program via the GPL/LGPL Option or -the SISSL Option. Copies of the GPL, LGPL and SISSL licenses can be -found http://www.openoffice.org/project/www/license.html</P> +<P> +This product is made available subject to the terms of GNU Lesser General +Public License Version 2.1. A copy of the LGPL license can be found +http://www.openoffice.org/project/www/license.html +</P> <HR> <P><BF>Third Party Code</BF> Additional copyright notices and license terms diff --git a/readlicense_oo/source/license/wnt/license_en-US.html b/readlicense_oo/source/license/wnt/license_en-US.html index 24906fd78929..c4f997fc6a3e 100644 --- a/readlicense_oo/source/license/wnt/license_en-US.html +++ b/readlicense_oo/source/license/wnt/license_en-US.html @@ -11,14 +11,9 @@ </HEAD> <BODY LANG="en-US"> <H1>(License text)</H1> -<P>You may only copy and distribute this program consistent with the -requirements and distribute this Program consistent with the -requirements of either the GNU General Public License (GPL) and GNU -Lesser General Public License (LGPL) or the Sun Industry Standards -Source License (SISSL), respectively, depending on whether you -elected to obtain access to this program via the GPL/LGPL Option or -the SISSL Option. Copies of the GPL, LGPL and SISSL licenses can be -found http://www.openoffice.org/project/www/license.html</P> +<P> +This product is made available subject to the terms of GNU Lesser General Public License Version 2.1. A copy of the LGPL license can be found http://www.openoffice.org/project/www/license.html +</P> <HR> |