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/cairo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cairo/Makefile') diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 35fcf82cc..177a4a4ad 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.12.16 PKG_RELEASE:= 4 PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library -PKG_SECTION:= libs +PKG_SECTION:= libs/image PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman PKG_DEPENDS+= libxrender PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib -- cgit v1.2.3