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/libjpeg-turbo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libjpeg-turbo') diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index d4e1a633e..751ec4c9a 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libjpeg-turbo PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 2c3a68129dac443a72815ff5bb374b05 -PKG_DESCR:= JPEG library -PKG_SECTION:= libs +PKG_DESCR:= jpeg image library +PKG_SECTION:= libs/image PKG_URL:= http://libjpeg-turbo.virtualgl.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} PKG_OPTS:= dev -- cgit v1.2.3