diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
| commit | 16832959361d205cc25b21cd1aeaad9b90f41ea0 (patch) | |
| tree | c443efd6dae8f4886be54e6675c51a493660b567 /libtextcat | |
| parent | f75fcb170699d867e1892c9f2b696a1b152cd16f (diff) | |
| parent | 4bc7de8f2867c8942e17220e1eb9539594b54475 (diff) | |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'libtextcat')
| -rw-r--r-- | libtextcat/libtextcat-2.2.patch | 8 | ||||
| -rw-r--r-- | libtextcat/makefile.mk | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch index b9124f3df377..499ff3d4d442 100644 --- a/libtextcat/libtextcat-2.2.patch +++ b/libtextcat/libtextcat-2.2.patch @@ -932,20 +932,16 @@ +} --- misc/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:30:06 2008 +++ misc/build/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:29:42 2008 -@@ -1 +1,91 @@ +@@ -1 +1,87 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# -+# $RCSfile: libtextcat-2.2.patch,v $ -+# -+# $Revision: 1.8 $ -+# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index c7d66e58cb62..5ac18a9402c2 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |