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/iperf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iperf') diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 4cde89a6d..4171ae9a1 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb PKG_DESCR:= internet protocol bandwidth measuring tool -PKG_SECTION:= net +PKG_SECTION:= net/perf PKG_DEPENDS:= libpthread PKG_URL:= http://sourceforge.net/projects/iperf PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} -- cgit v1.2.3