diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 12:16:11 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 12:16:11 +0000 |
commit | 41987a1d7d50b7169a0c32d02b3145171facb41d (patch) | |
tree | e8089f5fdf94b21e13e538824b118561cd9bed59 /sj2 | |
parent | 8a03446f8efddcc757fff43425ee82fea7aa5566 (diff) |
INTEGRATION: CWS changefileheader (1.2.62); FILE MERGED
2008/03/31 15:27:23 rt 1.2.62.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sj2')
-rw-r--r-- | sj2/stardiv/applet/resources/MsgAppletViewer.java | 41 | ||||
-rw-r--r-- | sj2/stardiv/applet/resources/makefile.mk | 42 | ||||
-rw-r--r-- | sj2/stardiv/security/resources/MsgAppletViewer.java | 41 | ||||
-rw-r--r-- | sj2/stardiv/security/resources/makefile.mk | 42 | ||||
-rw-r--r-- | sj2/util/target.pmk | 42 |
5 files changed, 93 insertions, 115 deletions
diff --git a/sj2/stardiv/applet/resources/MsgAppletViewer.java b/sj2/stardiv/applet/resources/MsgAppletViewer.java index 8748667517ab..e50dd2463482 100644 --- a/sj2/stardiv/applet/resources/MsgAppletViewer.java +++ b/sj2/stardiv/applet/resources/MsgAppletViewer.java @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: MsgAppletViewer.java,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-07 20:17:48 $ + * $RCSfile: MsgAppletViewer.java,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ package stardiv.applet.resources; diff --git a/sj2/stardiv/applet/resources/makefile.mk b/sj2/stardiv/applet/resources/makefile.mk index d54b97bbd4f3..af89ef8a807d 100644 --- a/sj2/stardiv/applet/resources/makefile.mk +++ b/sj2/stardiv/applet/resources/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.2 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: rt $ $Date: 2005-09-07 20:18:10 $ +# $Revision: 1.3 $ # -# 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. # #************************************************************************* diff --git a/sj2/stardiv/security/resources/MsgAppletViewer.java b/sj2/stardiv/security/resources/MsgAppletViewer.java index 7c02dcc900e8..a2f567878c3e 100644 --- a/sj2/stardiv/security/resources/MsgAppletViewer.java +++ b/sj2/stardiv/security/resources/MsgAppletViewer.java @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: MsgAppletViewer.java,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-07 20:19:20 $ + * $RCSfile: MsgAppletViewer.java,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ package stardiv.security.resources; diff --git a/sj2/stardiv/security/resources/makefile.mk b/sj2/stardiv/security/resources/makefile.mk index 08f0c2dada20..f57edbbc4ac9 100644 --- a/sj2/stardiv/security/resources/makefile.mk +++ b/sj2/stardiv/security/resources/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.2 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: rt $ $Date: 2005-09-07 20:19:36 $ +# $Revision: 1.3 $ # -# 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. # #************************************************************************* diff --git a/sj2/util/target.pmk b/sj2/util/target.pmk index 2e6f65f79173..56da2446993c 100644 --- a/sj2/util/target.pmk +++ b/sj2/util/target.pmk @@ -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: target.pmk,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.2 $ +# $RCSfile: target.pmk,v $ # -# last change: $Author: rt $ $Date: 2005-09-07 20:20:25 $ +# $Revision: 1.3 $ # -# 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. # #************************************************************************* .IF "$(depend)" == "" |