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/moc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/moc') diff --git a/package/moc/Makefile b/package/moc/Makefile index 797e76b06..21a011bf3 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.0-beta2 PKG_RELEASE:= 1 PKG_MD5SUM:= da87b90b57934234589b63e347921458 PKG_DESCR:= console music player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/audio PKG_DEPENDS:= libmad libvorbis libcurl libflac PKG_DEPENDS+= libncurses libid3tag PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv-tiny -- cgit v1.2.3