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/apr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/apr') diff --git a/package/apr/Makefile b/package/apr/Makefile index 4041f401d..34e7536f4 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= apr PKG_VERSION:= 1.4.6 PKG_RELEASE:= 2 PKG_MD5SUM:= 76cc4457fbb71eefdafa27dba8f511fb -PKG_DESCR:= Apache Portable Runtime library -PKG_SECTION:= libs +PKG_DESCR:= apache portable runtime library +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -- cgit v1.2.3