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/libXft/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXft') diff --git a/package/libXft/Makefile b/package/libXft/Makefile index 3a3954d2b..2fe551bde 100644 --- a/package/libXft/Makefile +++ b/package/libXft/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXft PKG_VERSION:= 2.3.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 946a157090eec5c3041cf17530d93f59 -PKG_DESCR:= X FreeType library +PKG_DESCR:= freetype library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXrender fontconfig PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3