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/freetype/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/freetype') diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 65636568c..5270891e9 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.3 PKG_RELEASE:= 1 PKG_MD5SUM:= cafe9f210e45360279c730d27bf071e9 PKG_DESCR:= free, high-quality and portable font engine -PKG_SECTION:= libs +PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib freetype-host PKG_URL:= http://www.freetype.org/ -- cgit v1.2.3