diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-16 10:56:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-16 10:58:48 +0100 |
| commit | 34578b7c2706d2cca95eeb266aeb0498078bb55a (patch) | |
| tree | e71a3f88c14e61cd83a142404a12d5921032b7e7 /libexttextcat | |
| parent | 530a76c8effedc921cbf70293b6730620ec2fef2 (diff) | |
libexttextcat: conflict in 69b04c22986b03c675cf4925f76721190aa5ba82
Diffstat (limited to 'libexttextcat')
| -rw-r--r-- | libexttextcat/makefile.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk index 7633a0b553dd..f4f5383c8713 100644 --- a/libexttextcat/makefile.mk +++ b/libexttextcat/makefile.mk @@ -47,9 +47,7 @@ all: TARFILE_NAME=libexttextcat-3.2.0 TARFILE_MD5=e1c178b18f130b40494561f02bc1a948 TARFILE_ROOTDIR=libexttextcat-3.2.0 -PATCH_FILES=libexttextcat-3.2.0-visibility.patch - -PATCH_FILES = android.patch +PATCH_FILES=libexttextcat-3.2.0-visibility.patch android.patch .IF "$(GUI)"=="UNX" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" |