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/poppler/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/poppler/Makefile') diff --git a/package/poppler/Makefile b/package/poppler/Makefile index e2318555c..accce81ee 100644 --- a/package/poppler/Makefile +++ b/package/poppler/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.24.5 PKG_RELEASE:= 2 PKG_MD5SUM:= 334f2ac95cc8039f2a57fe63e4a81c69 PKG_DESCR:= pdf rendering library -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_BUILDDEP:= fontconfig libstdcxx libpng cairo PKG_DEPENDS:= fontconfig libstdcxx libpng cairo PKG_URL:= http://poppler.freedesktop.org/ -- cgit v1.2.3