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/glib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/glib') diff --git a/package/glib/Makefile b/package/glib/Makefile index b18056f32..00560e4be 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 2.38.2 PKG_RELEASE:= 4 PKG_EXTRAVER:= 2.38 PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f -PKG_DESCR:= low-level core library that forms the basis of GTK+ -PKG_SECTION:= libs +PKG_DESCR:= low-level core library that forms the basis of gtk+ +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpthread PKG_BUILDDEP:= glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus HOST_BUILDDEP:= libffi-host gettext-tiny-host libiconv-tiny-host python2-host -- cgit v1.2.3