From 6fb8f09023d3bf65d2da267935b44ea0c79ecffb Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Wed, 7 Sep 2005 21:03:34 +0000 Subject: INTEGRATION: CWS ooo19126 (1.5.18); FILE MERGED 2005/09/05 14:47:18 rt 1.5.18.1: #i54170# Change license header: remove SISSL --- bean/com/sun/star/comp/beans/makefile.mk | 69 ++++++++++---------------------- 1 file changed, 21 insertions(+), 48 deletions(-) (limited to 'bean') diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/com/sun/star/comp/beans/makefile.mk index 3a4baf0055ed..644b78121cd2 100644 --- a/bean/com/sun/star/comp/beans/makefile.mk +++ b/bean/com/sun/star/comp/beans/makefile.mk @@ -1,62 +1,35 @@ #************************************************************************* # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# -# last change: $Author: vg $ $Date: 2005-03-23 08:59:36 $ -# -# 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 -# -# Sun Microsystems Inc., September, 2004 -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2004 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 +# OpenOffice.org - a multi-platform office productivity suite # +# $RCSfile: makefile.mk,v $ # -# 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. +# $Revision: 1.6 $ # -# 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. +# last change: $Author: rt $ $Date: 2005-09-07 22:03:34 $ # -# The Initial Developer of the Original Code is: Sun Microsystems, Inc. +# The Contents of this file are made available subject to +# the terms of GNU Lesser General Public License Version 2.1. # -# Copyright: 2004 by Sun Microsystems, Inc. # -# All Rights Reserved. +# GNU Lesser General Public License Version 2.1 +# ============================================= +# Copyright 2005 by Sun Microsystems, Inc. +# 901 San Antonio Road, Palo Alto, CA 94303, USA # -# Contributor(s): _______________________________________ +# 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 # #************************************************************************* -- cgit