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/openswan/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/openswan/Makefile') diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 40ea4161a..787c452fa 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= openswan PKG_VERSION:= 2.6.41 PKG_RELEASE:= 1 PKG_MD5SUM:= da2e8b02ecc30a408cc5766767fef84f -PKG_DESCR:= IPsec software +PKG_DESCR:= ipsec software PKG_SECTION:= net/security PKG_DEPENDS:= ip libgmp libpthread PKG_BUILDDEP:= gmp -- cgit v1.2.3