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/tinyxml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/tinyxml/Makefile') diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile index 568cc1071..372b2baa8 100644 --- a/package/tinyxml/Makefile +++ b/package/tinyxml/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= tinyxml PKG_VERSION:= 2.6.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a0aaf609c9e670ec9748cd01ed52dae -PKG_DESCR:= a simple, small, minimal, C++ XML parser -PKG_SECTION:= libs +PKG_DESCR:= simple, small, minimal, c++ xml parser +PKG_SECTION:= libs/data PKG_URL:= http://sourceforge.net/projects/tinyxml/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tinyxml/} PKG_OPTS:= dev -- cgit v1.2.3