summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-04-11 09:16:59 +0000
committerRüdiger Timm <rt@openoffice.org>2008-04-11 09:16:59 +0000
commita3439d965dfd655ee7fb9a274e33491aac2622b9 (patch)
tree872b942d9c3632541c9579bbc7597555f20a68fc
parent7968cc09c6897aea8ab5c725647fb9c771b902bb (diff)
INTEGRATION: CWS changefileheader (1.8.4); FILE MERGED
2008/03/31 07:24:49 rt 1.8.4.1: #i87441# Change license header to LPGL v3.
-rwxr-xr-xjvmfwk/distributions/OpenOfficeorg/makefile.mk42
1 files changed, 19 insertions, 23 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
index 153e1067524a..26e73285cd26 100755
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
@@ -1,35 +1,31 @@
#*************************************************************************
#
-# OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
#
-# $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
#
-# $Revision: 1.8 $
+# $RCSfile: makefile.mk,v $
#
-# last change: $Author: vg $ $Date: 2008-03-18 12:20:25 $
+# $Revision: 1.9 $
#
-# The Contents of this file are made available subject to
-# the terms of GNU Lesser General Public License Version 2.1.
+# This file is part of OpenOffice.org.
#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
#
-# GNU Lesser General Public License Version 2.1
-# =============================================
-# Copyright 2005 by Sun Microsystems, Inc.
-# 901 San Antonio Road, Palo Alto, CA 94303, USA
+# OpenOffice.org 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 version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
#
-# 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
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
#
#*************************************************************************