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/zlib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/zlib/Makefile') diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 6fe11ae3d..d0a991f65 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 2ab442d169156f34c379c968f3f482dd PKG_DESCR:= implementation of the deflate compression method -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_URL:= http://www.zlib.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/zlib/} PKG_OPTS:= dev -- cgit v1.2.3