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/xvidcore/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xvidcore/Makefile') diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile index 9c8be64e7..56efc05f7 100644 --- a/package/xvidcore/Makefile +++ b/package/xvidcore/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= xvidcore PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 87c8cf7b69ebed93c2d82ea5709d098a -PKG_DESCR:= Xvid Codec library -PKG_SECTION:= libs +PKG_DESCR:= xvid codec library +PKG_SECTION:= libs/video PKG_URL:= http://www.xvid.org/ PKG_SITES:= http://downloads.xvid.org/downloads/ PKG_LIBNAME:= libxvid -- cgit v1.2.3