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/libosip2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libosip2') diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 65060c339..67b7b77cb 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libosip2 PKG_VERSION:= 3.3.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 81493bb4d4ae6d55b71a0d4369339125 -PKG_DESCR:= SIP (Session Initiation Protocol) implementation -PKG_SECTION:= libs +PKG_DESCR:= session initiation protocol implementation +PKG_SECTION:= libs/net PKG_DEPENDS:= libpthread PKG_URL:= http://www.gnu.org/software/osip PKG_SITES:= ${MASTER_SITE_GNU:=osip/} -- cgit v1.2.3