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/pulseaudio/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pulseaudio') diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index ddca9a233..6e095a668 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= pulseaudio PKG_VERSION:= 4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 -PKG_DESCR:= sound system for POSIX OSes -PKG_SECTION:= multimedia +PKG_DESCR:= sound system +PKG_SECTION:= mm/audio PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile PKG_DEPENDS+= libpthread librt alsa-lib libsamplerate -- cgit v1.2.3