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/madplay/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/madplay/Makefile') diff --git a/package/madplay/Makefile b/package/madplay/Makefile index 09e2853dd..2c5212282 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= madplay PKG_VERSION:= 0.15.2b PKG_RELEASE:= 2 PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1 -PKG_DESCR:= MPEG audio player in fixed point -PKG_SECTION:= multimedia +PKG_DESCR:= mpeg audio player in fixed point +PKG_SECTION:= mm/audio PKG_DEPENDS:= libid3tag libmad alsa-lib PKG_BUILDDEP:= libid3tag libmad alsa-lib PKG_URL:= http://www.underbit.com/products/mad -- cgit v1.2.3