summaryrefslogtreecommitdiffstats
path: root/hyphen
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-03-10 16:36:40 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-03-10 16:36:40 +0100
commitc2d29ac9121978fb53dc7e4e17202aebcab749cd (patch)
tree10325b564e2a14afd9c843dfb2e1093dc239a8ec /hyphen
parentause110: update to DEV300_m71 (diff)
parentDEV300 masterfix: #i10000# Module external_so does not exist any more. (diff)
downloadcore-c2d29ac9121978fb53dc7e4e17202aebcab749cd.tar.gz
core-c2d29ac9121978fb53dc7e4e17202aebcab749cd.zip
ause110: update to DEV300_m74
Diffstat (limited to 'hyphen')
-rw-r--r--hyphen/hyphen-2.4.patch8
-rw-r--r--hyphen/makefile.mk6
2 files changed, 3 insertions, 11 deletions
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
index 5aef3422d22a..33947f550a88 100644
--- a/hyphen/hyphen-2.4.patch
+++ b/hyphen/hyphen-2.4.patch
@@ -110,20 +110,16 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
--- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200
+++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200
-@@ -1 +1,58 @@
+@@ -1 +1,54 @@
-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: hyphen-2.4.patch,v $
-+#
-+# $Revision: 1.1.4.2 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 6a29b60b14b0..983660cc71fb 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/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.2.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify