diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/iperf | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/iperf')
-rw-r--r-- | package/iperf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/} |