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/libXfont/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libXfont/Makefile') diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile index c220b35df..751c404cf 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXfont PKG_VERSION:= 1.4.5 PKG_RELEASE:= 2 PKG_MD5SUM:= a54dea0debecf232a346c22e71d76836 -PKG_DESCR:= X font Library +PKG_DESCR:= x11 font library PKG_SECTION:= x11/libs PKG_DEPENDS:= libfreetype PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans -- cgit v1.2.3