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/libtiff/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libtiff') diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index e9e3c66c0..c62a47fab 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= tiff PKG_VERSION:= 3.9.4 PKG_RELEASE:= 4 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 -PKG_DESCR:= library for reading/writing TIFF images +PKG_DESCR:= library for reading/writing tiff images PKG_DEPENDS:= libstdcxx -PKG_SECTION:= libs +PKG_SECTION:= libs/image PKG_URL:= http://www.libtiff.org/ PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ PKG_LIBNAME:= libtiff -- cgit v1.2.3