INTEGRATION: CWS geordi2q11 (1.2.54); FILE MERGED

2003/12/15 18:00:07 hr 1.2.54.1: #111934#: join CWS ooo111fix1

crashrep/source/win32/makefile.mk

@@ -2,15 +2,14 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: vg $ $Date: 2003-12-16 11:20:47 $
+#   last change: $Author: vg $ $Date: 2003-12-17 19:29:46 $
 #
 #   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
 #
@@ -34,20 +33,6 @@
 #   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.