diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/dillo/patches/patch-Makefile_in | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/dillo/patches/patch-Makefile_in')
| -rw-r--r-- | package/dillo/patches/patch-Makefile_in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in index 6b18010d3..ff0c0c32f 100644 --- a/package/dillo/patches/patch-Makefile_in +++ b/package/dillo/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- dillo-2.2.orig/Makefile.in 2010-02-11 11:20:01.000000000 +0100 -+++ dillo-2.2/Makefile.in 2011-01-07 21:37:49.000000000 +0100 +--- dillo-3.0.orig/Makefile.in 2011-09-06 22:55:42.000000000 +0200 ++++ dillo-3.0/Makefile.in 2011-09-12 20:25:51.000482366 +0200 @@ -242,7 +242,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = lout dw dlib dpip src doc dpid dpi test +SUBDIRS = lout dw dlib dpip src doc dpid dpi - EXTRA_DIST = Doxyfile dillorc install-dpi-local + EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h sysconf_DATA = dillorc all: config.h |