fix up hyphen 2.8.2/2.8.3 conflicts

e894342d · Caolán McNamara · 161a463b · 161a463b · e894342d
Kaydet (Commit) e894342d authored Eki 24, 2011 tarafından Caolán McNamara
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

hyphen-2.7.1-2.8.2.patch hyphen/hyphen-2.7.1-2.8.2.patch +0 -0

makefile.mk hyphen/makefile.mk +1 -1

No files found.
--- a/hyphen/hyphen-2.7.1-2.8.2.patch
+++ b/hyphen/hyphen-2.7.1-2.8.2.patch
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -44,7 +44,7 @@ ADDITIONAL_FILES += makefile.mk
 PATCH_FILES= \
    hyphen-2.7.1.patch \
    hyphen-2.7.1-read-charset.patch \
-    hyphen-2.7.1-2.8.2.patch
+    hyphen-2.7.1-2.8.3.patch

 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)