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/libtasn1/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libtasn1') diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 0925440b2..8d124ec86 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libtasn1 PKG_VERSION:= 3.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 6ed38e161e11013054f2a2bb4c4da449 -PKG_DESCR:= ASN.1 and DER structures manipulation library -PKG_SECTION:= libs +PKG_DESCR:= asn.1 and der structures manipulation library +PKG_SECTION:= libs/crypto PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ${MASTER_SITE_GNU:=libtasn1/} PKG_OPTS:= dev -- cgit v1.2.3