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/libmicrohttpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libmicrohttpd') diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index 4fcf1c011..ba1e006e6 100644 --- a/package/libmicrohttpd/Makefile +++ b/package/libmicrohttpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libmicrohttpd PKG_VERSION:= 0.9.36 PKG_RELEASE:= 1 PKG_MD5SUM:= d4ebabaef27a2126efb7af0d085b1895 -PKG_DESCR:= library make it easy to run an HTTP server -PKG_SECTION:= libs +PKG_DESCR:= library make it easy to run an webserver +PKG_SECTION:= libs/net PKG_DEPENDS:= libgcrypt PKG_BUILDDEP:= libgcrypt PKG_URL:= http://www.gnu.org/software/libmicrohttpd/ -- cgit v1.2.3