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/xbmc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xbmc') diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index abb920ee6..549528b3f 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 13.1rc1 PKG_RELEASE:= 1 PKG_MD5SUM:= 1eb727c04cdc8282e9c2cb1f45ceeaae PKG_DESCR:= software media player -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_DEPENDS:= boost libffmpeg python2 libstdcxx PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl -- cgit v1.2.3