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/mini_httpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/mini_httpd/Makefile') diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 731b95d4d..d3e595989 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= mini-httpd PKG_VERSION:= 1.19 PKG_RELEASE:= 10 PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f -PKG_DESCR:= small HTTP server with SSL -PKG_SECTION:= www +PKG_DESCR:= small webserver with ssl +PKG_SECTION:= net/http PKG_DEPENDS:= libopenssl PKG_BUILDDEP:= openssl PKG_URL:= http://www.acme.com/software/mini_httpd/ -- cgit v1.2.3