diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-09-09 04:09:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-09-09 04:09:02 +0000 |
| commit | 0860f850c69d0aaac6563432a5f52d18b5fe2d12 (patch) | |
| tree | d251d6f163cc0291522c9646716066d26c01ab31 /readlicense_oo | |
| parent | 262ca2ccb8b7cd21304f5dda12210bb320a6e52b (diff) | |
INTEGRATION: CWS ooo19126 (1.2.46); FILE MERGED
2005/09/05 14:40:48 mh 1.2.46.2: update license text, #i54228#
2005/09/05 13:17:44 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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/readlicense_oo/source/license/unx/LICENSE_en-US b/readlicense_oo/source/license/unx/LICENSE_en-US index 6fa3bcbf5b..1636f0904f 100644 --- a/readlicense_oo/source/license/unx/LICENSE_en-US +++ b/readlicense_oo/source/license/unx/LICENSE_en-US @@ -1,8 +1,13 @@ -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 +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 ------------------------------------ Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file. +-------------------------------------------------------------------------------- +All trademarks and registered trademarks mentioned herein are the property of their respective owners. + ------------------------------------ Copyright 2002,2005 Sun Microsystems, Inc. |