User: rt Date: 05/09/07 21:56:15 Modified: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ makefile.mk
Log: INTEGRATION: CWS ooo19126 (1.5.68); FILE MERGED 2005/09/05 17:22:35 rt 1.5.68.1: #i54170# Change license header: remove SISSL File Changes: Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk?r1=1.5&r2=1.6 Delta lines: +31 -58 --------------------- --- makefile.mk 15 Mar 2005 09:04:54 -0000 1.5 +++ makefile.mk 8 Sep 2005 04:56:11 -0000 1.6 @@ -1,22 +1,20 @@ #************************************************************************* # +# OpenOffice.org - a multi-platform office productivity suite +# # $RCSfile$ # # $Revision$ # # last change: $Author$ $Date$ # -# 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 +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. # -# Sun Microsystems Inc., October, 2000 # # GNU Lesser General Public License Version 2.1 # ============================================= -# Copyright 2000 by Sun Microsystems, Inc. +# Copyright 2005 by Sun Microsystems, Inc. # 901 San Antonio Road, Palo Alto, CA 94303, USA # # This library is free software; you can redistribute it and/or @@ -33,31 +31,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -# -# 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. -# -# 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: Sun Microsystems, Inc. -# -# Copyright: 2000 by Sun Microsystems, Inc. -# -# All Rights Reserved. -# -# Contributor(s): Ocke Janssen -# -# -# #************************************************************************* PRJ = ..$/..$/..$/..$/..$/.. PRJNAME = connectivity --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
