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/sox/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/sox') diff --git a/package/sox/Makefile b/package/sox/Makefile index 9a41f1e9a..debfcee83 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 14.4.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 670307f40763490a2bc0d1f322071e7a PKG_DESCR:= swiss army knife of sound processing programs -PKG_SECTION:= multimedia +PKG_SECTION:= mm/audio PKG_BUILDDEP:= zlib libmad lame alsa-lib libid3tag PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag PKG_URL:= http://sox.sourceforge.net/ -- cgit v1.2.3