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/yajl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/yajl') diff --git a/package/yajl/Makefile b/package/yajl/Makefile index ae66e893a..2dd768c11 100644 --- a/package/yajl/Makefile +++ b/package/yajl/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= yajl PKG_VERSION:= 2.0.1 PKG_RELEASE:= 1 PKG_MD5SUM:= c953a53344c0e20a892fc042bbe69744 -PKG_DESCR:= small event-driven JSON parser written in ANSI C -PKG_SECTION:= libs +PKG_DESCR:= small event-driven json parser written in ansi c +PKG_SECTION:= libs/data PKG_BUILDDEP:= cmake-host ruby-host PKG_URL:= http://lloyd.github.com/yajl/ PKG_SITES:= http://openadk.org/distfiles/ -- cgit v1.2.3