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/vlc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/vlc') diff --git a/package/vlc/Makefile b/package/vlc/Makefile index a33a1efb1..b1934aedf 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 7ed67d22f7425011078772bfc62ac222 PKG_DESCR:= popular media player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ -- cgit v1.2.3