INTEGRATION: CWS ooo19126 (1.4.70); FILE MERGED

2005/09/05 14:05:07 rt 1.4.70.1: #i54170# Change license header: remove SISSL

1 files changed, 21 insertions, 48 deletions

diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index aa8f6cd6d1c5..a5773d4f2b83 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -1,62 +1,35 @@
 #*************************************************************************
 #
-#	$RCSfile: makefile.mk,v $
+#   OpenOffice.org - a multi-platform office productivity suite
 #
-#	$Revision: 1.4 $
+#   $RCSfile: makefile.mk,v $
 #
-#	last change: $Author: rt $ $Date: 2004-10-22 08:17:21 $
+#   $Revision: 1.5 $
 #
-#	The Contents of this file are made available subject to the terms of
-#	either of the following licenses
+#   last change: $Author: rt $ $Date: 2005-09-07 19:55:11 $
 #
-#		   - 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.
-#	901 San Antonio Road, Palo Alto, CA 94303, USA
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     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
-#	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
-#	=================================================
-#	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): _______________________________________
+#     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
 #
 #*************************************************************************