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/mplayer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/mplayer') diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 51ecceea4..38a702a99 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_DEPENDS:= alsa-lib libjpeg-turbo libfaad2 libmad libncurses PKG_DEPENDS+= libogg libpng libpthread libvorbis giflib PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib -- cgit v1.2.3