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/webkitgtk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/webkitgtk') diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index d007e78e1..94638fb33 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 PKG_MD5SUM:= da2b1b0f0863f3f21bdbc0476001589f PKG_DESCR:= web browser engine -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk libsoup PKG_DEPENDS+= libsecret libxt harfbuzz PKG_DEPENDS+= gst-plugins-base gstreamer -- cgit v1.2.3