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/libass/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libass') diff --git a/package/libass/Makefile b/package/libass/Makefile index c4cdffed9..3e74c1a91 100644 --- a/package/libass/Makefile +++ b/package/libass/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libass PKG_VERSION:= 0.10.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 0f54b1f3a24fa897ebbbcc5bc744b32a -PKG_DESCR:= a portable subtitle renderer for the ASS/SSA format -PKG_SECTION:= libs +PKG_DESCR:= portable subtitle renderer +PKG_SECTION:= libs/video PKG_DEPENDS:= fribidi fontconfig PKG_BUILDDEP:= fribidi fontconfig PKG_URL:= http://code.google.com/p/libass/ -- cgit v1.2.3