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/wireless-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/wireless-tools') diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index fe22d9e3c..0c0529a43 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= wireless-tools PKG_VERSION:= 29 PKG_RELEASE:= 1 PKG_MD5SUM:= e06c222e186f7cc013fd272d023710cb -PKG_DESCR:= Linux wireless tools (for older wireless drivers) -PKG_SECTION:= wifi +PKG_DESCR:= wireless tools (for older wireless drivers) +PKG_SECTION:= net/wifi PKG_SITES:= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/ DISTFILES:= wireless_tools.${PKG_VERSION}.tar.gz -- cgit v1.2.3