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/sdl-image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/sdl-image') diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index b3e7a9a36..66ae0931b 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 PKG_DESCR:= simple directmedia layer image library -PKG_SECTION:= libs +PKG_SECTION:= libs/image PKG_DEPENDS:= libpng libtiff libjpeg-turbo libsdl libstdcxx PKG_BUILDDEP:= libpng libtiff libjpeg-turbo sdl PKG_URL:= http://www.libsdl.org/ -- cgit v1.2.3