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/libmad/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libmad') diff --git a/package/libmad/Makefile b/package/libmad/Makefile index b3e035c09..b12245425 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libmad PKG_VERSION:= 0.15.1b PKG_RELEASE:= 6 PKG_MD5SUM:= 1be543bc30c56fb6bea1d7bf6a64e66c -PKG_DESCR:= high-quality MPEG audio decoding library -PKG_SECTION:= libs +PKG_DESCR:= high-quality mpeg audio decoding library +PKG_SECTION:= libs/audio PKG_BUILDDEP:= autotool PKG_URL:= http://sourceforge.net/projects/mad PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} -- cgit v1.2.3