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/liblzo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/liblzo') diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index 9402b7a1e..81f69f5bf 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= lzo PKG_VERSION:= 2.06 PKG_RELEASE:= 1 PKG_MD5SUM:= 95380bd4081f85ef08c5209f4107e9f8 -PKG_DESCR:= a real-time data compression library -PKG_SECTION:= libs +PKG_DESCR:= real-time data compression library +PKG_SECTION:= libs/misc PKG_URL:= http://www.oberhumer.com/opensource/lzo PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ PKG_LIBNAME:= liblzo -- cgit v1.2.3