diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-12 19:20:46 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-13 13:02:02 +0000 |
| commit | df4d4db7408ed3fc135eded6787bad80853619fd (patch) | |
| tree | 050f1e400474991f0611e685c37de6899229b571 /util/simpress | |
| parent | 2700032f791ae80431ec7dc3429a963afa709fde (diff) | |
re-base on ALv2 code. Includes:
Patch contributed by Oliver Rainer-Wittmann
i#118572 - remove ui string and help content regarding
usage of Java Mail in Writer's Mail Merge as Java
Mail is not used.
http://svn.apache.org/viewvc?view=revision&revision=1197035
Patches contributed by Herbert Duerr
updated help text for regexp word boundaries
http://svn.apache.org/viewvc?view=revision&revision=1228026
improved help text for word boundary regexp expression \b
http://svn.apache.org/viewvc?view=revision&revision=1234738
Patches contributed by Jurgen Schmidt
remove onlineregistration with dependencies
http://svn.apache.org/viewvc?view=revision&revision=1240245
Patch contributed by Regina Henschel
Extended tips for corner and cap style
http://svn.apache.org/viewvc?view=revision&revision=1242287
* re-enable on-line update help, remove obsolete on-line purchasing.
Diffstat (limited to 'util/simpress')
| -rw-r--r-- | util/simpress/makefile.mk | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/util/simpress/makefile.mk b/util/simpress/makefile.mk index 097f905516..0f40d5467a 100644 --- a/util/simpress/makefile.mk +++ b/util/simpress/makefile.mk @@ -1,29 +1,20 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# 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. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . # -# 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). -# -# 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. -# -#************************************************************************* # edit to match directory level @@ -857,7 +848,6 @@ LINKLINKFILES= \ text$/shared$/autopi$/01170300.xhp \ text$/shared$/autopi$/01170400.xhp \ text$/shared$/autopi$/01170500.xhp \ - text$/shared$/autopi$/purchase.xhp \ text$/shared$/autopi$/webwizard00.xhp \ text$/shared$/autopi$/webwizard01.xhp \ text$/shared$/autopi$/webwizard02.xhp \ |