diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/serdisplib/patches/patch-configure | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/serdisplib/patches/patch-configure')
| -rw-r--r-- | package/serdisplib/patches/patch-configure | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/serdisplib/patches/patch-configure b/package/serdisplib/patches/patch-configure index aaf687695..b4ea718bd 100644 --- a/package/serdisplib/patches/patch-configure +++ b/package/serdisplib/patches/patch-configure @@ -1,7 +1,7 @@ $Id$ ---- serdisplib-1.97.3.orig/configure 2007-02-15 23:24:51.000000000 +0100 -+++ serdisplib-1.97.3/configure 2007-05-23 00:00:41.000000000 +0200 -@@ -2644,18 +2644,6 @@ echo "${ECHO_T}no" >&6 +--- serdisplib-1.97.8.orig/configure 2008-07-19 00:40:38.000000000 +0200 ++++ serdisplib-1.97.8/configure 2009-05-30 18:04:39.526453915 +0200 +@@ -2661,18 +2661,6 @@ echo "${ECHO_T}no" >&6 fi |