INTEGRATION: CWS pj57 (1.2.24); FILE MERGED

2006/07/26 07:40:18 pjanik 1.2.24.1: #i61626#: Remove deprecated SISSL license.

1 files changed, 34 insertions, 60 deletions

diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk
index 5e380af67e3e..d06f205748e8 100644
--- a/xmerge/source/activesync/makefile.mk
+++ b/xmerge/source/activesync/makefile.mk
@@ -1,64 +1,38 @@
-#************************************************************************* 
-# 
-#   $RCSfile: makefile.mk,v $ 
-# 
-#   $Revision: 1.2 $ 
+#*************************************************************************
 #
-#   last change: $Author: hr $ $Date: 2005-10-24 16:02:03 $ 
-# 
-#   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., 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 
-#   ================================================= 
-#   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): _______________________________________ 
-# 
-# 
-# 
-#*************************************************************************  
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: ihi $ $Date: 2006-08-01 12:38:52 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     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
+#
+#*************************************************************************
+
 PRJ	= ..$/.. 
 PRJNAME = xmerge
 #PACKAGE = com$/sun$/star$/documentconversion$/XSLTFilter