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/giflib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/giflib') diff --git a/package/giflib/Makefile b/package/giflib/Makefile index 8229a3c74..e3ef993bb 100644 --- a/package/giflib/Makefile +++ b/package/giflib/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= giflib PKG_VERSION:= 4.1.6 PKG_RELEASE:= 3 PKG_MD5SUM:= 4ff2ecec336b9724c5190f06e8a40f9e -PKG_DESCR:= GIF graphics library -PKG_SECTION:= libs +PKG_DESCR:= gif graphics library +PKG_SECTION:= libs/image PKG_URL:= http://sourceforge.net/projects/giflib/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/} PKG_OPTS:= dev -- cgit v1.2.3