INTEGRATION: CWS ooo19126 (1.8.12); FILE MERGED

2005/09/05 13:53:31 rt 1.8.12.1: #i54170# Change license header: remove SISSL
This commit is contained in:
Rüdiger Timm 2005-09-07 21:06:52 +00:00
parent e286e37b67
commit 67e4ba4b1d

View file

@ -1,62 +1,35 @@
#************************************************************************* #*************************************************************************
# #
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.8 $ # $Revision: 1.9 $
# #
# last change: $Author: hr $ $Date: 2005-04-06 10:09:48 $ # last change: $Author: rt $ $Date: 2005-09-07 22:06:52 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to
# either of the following licenses # the terms of GNU Lesser General Public License Version 2.1.
#
# - GNU Lesser General Public License Version 2.1
# - Sun Industry Standards Source License Version 1.1
#
# Sun Microsystems Inc., October, 2000
#
# GNU Lesser General Public License Version 2.1
# =============================================
# Copyright 2000 by Sun Microsystems, Inc.
# 901 San Antonio Road, Palo Alto, CA 94303, USA
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License version 2.1, as published by the Free Software Foundation.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
# #
# #
# Sun Industry Standards Source License Version 1.1 # GNU Lesser General Public License Version 2.1
# ================================================= # =============================================
# The contents of this file are subject to the Sun Industry Standards # Copyright 2005 by Sun Microsystems, Inc.
# Source License Version 1.1 (the "License"); You may not use this file # 901 San Antonio Road, Palo Alto, CA 94303, USA
# except in compliance with the License. You may obtain a copy of the
# License at http://www.openoffice.org/license.html.
# #
# Software provided under this License is provided on an "AS IS" basis, # This library is free software; you can redistribute it and/or
# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, # modify it under the terms of the GNU Lesser General Public
# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, # License version 2.1, as published by the Free Software Foundation.
# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
# See the License for the specific provisions governing your rights and
# obligations concerning the Software.
#
# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
#
# Copyright: 2000 by Sun Microsystems, Inc.
#
# All Rights Reserved.
#
# Contributor(s): _______________________________________
# #
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
# #
#************************************************************************* #*************************************************************************