From 1a9bd63f2109d61e6f806ae092b1b455a418e59b Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 7 Sep 2005 15:27:52 +0000 Subject: INTEGRATION: CWS ooo19126 (1.9.4); FILE MERGED 2005/09/05 17:37:00 rt 1.9.4.1: #i54170# Change license header: remove SISSL --- hsqldb/makefile.mk | 67 +++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 46 deletions(-) (limited to 'hsqldb') diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 62595d5772d4..1cdb90159bc4 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -1,60 +1,35 @@ #************************************************************************* # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# -# last change: $Author: obo $ $Date: 2005-07-20 13:24:41 $ -# -# The Contents of this file are made available subject to the terms of -# either of the following licenses -# -# - GNU Lesser General Public License Version 2.1 -# - Sun Industry Standards Source License Version 1.1 +# OpenOffice.org - a multi-platform office productivity suite # -# 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. +# $RCSfile: makefile.mk,v $ # -# 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 +# $Revision: 1.10 $ # +# last change: $Author: rt $ $Date: 2005-09-07 16:27:52 $ # -# Sun Industry Standards Source License Version 1.1 -# ================================================= -# The contents of this file are subject to the Sun Industry Standards -# Source License Version 1.1 (the "License"); You may not use this file -# except in compliance with the License. You may obtain a copy of the -# License at http://www.openoffice.org/license.html. +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. # -# Software provided under this License is provided on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -# 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: Ralph Thomas +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA # -# Copyright: 2000 by Sun Microsystems, Inc. +# 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. # -# All Rights Reserved. +# 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. # -# Contributor(s): Ocke Janssen +# 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 # #************************************************************************* -- cgit v1.2.3