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/motion/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/motion') diff --git a/package/motion/Makefile b/package/motion/Makefile index e4ba763fb..a912ba716 100644 --- a/package/motion/Makefile +++ b/package/motion/Makefile @@ -8,8 +8,8 @@ PKG_NAME:= motion PKG_VERSION:= 4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 6b8730c875e0f550c1abdb647027d8e1 -PKG_DESCR:= Webcam motion sensing and logging -PKG_SECTION:= multimedia +PKG_DESCR:= webcam motion sensing and logging +PKG_SECTION:= mm/video PKG_DEPENDS:= libjpeg-turbo libpthread libsdl PKG_BUILDDEP:= libjpeg-turbo sdl PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -- cgit v1.2.3