From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/iftop/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iftop') diff --git a/package/iftop/Makefile b/package/iftop/Makefile index f2c1883a2..0be7b16a9 100644 --- a/package/iftop/Makefile +++ b/package/iftop/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.17 PKG_RELEASE:= 1 PKG_MD5SUM:= 062bc8fb3856580319857326e0b8752d PKG_DESCR:= display bandwith usage on an interface -PKG_SECTION:= net +PKG_SECTION:= net/perf PKG_DEPENDS:= libncurses libpcap libpthread PKG_BUILDDEP:= libpcap libpthread ncurses PKG_URL:= http://www.ex-parrot.com/~pdw/iftop/ -- cgit v1.2.3