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/libpng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libpng') diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 0a35c42e2..12f5bcfc6 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libpng PKG_VERSION:= 1.6.10 PKG_RELEASE:= 1 PKG_MD5SUM:= 5f414b20f683b1d96b163c89e3eff768 -PKG_DESCR:= library for reading/writing PNG images -PKG_SECTION:= libs +PKG_DESCR:= library for reading/writing png images +PKG_SECTION:= libs/image PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.libpng.org/pub/png/libpng.html -- cgit v1.2.3