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/neon/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/neon') diff --git a/package/neon/Makefile b/package/neon/Makefile index 2d2daea93..ad98ae31e 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= neon PKG_VERSION:= 0.29.5 PKG_RELEASE:= 2 PKG_MD5SUM:= ff369e69ef0f0143beb5626164e87ae2 -PKG_DESCR:= HTTP and WebDAV library -PKG_SECTION:= libs +PKG_DESCR:= http and webdav library +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpthread libxml2 libopenssl zlib PKG_BUILDDEP:= libpthread libxml2 openssl zlib PKG_URL:= http://webdav.org/neon/ -- cgit v1.2.3