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/ptunnel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ptunnel') diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index 927e26ed2..bd19188d7 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= ptunnel PKG_VERSION:= 0.61 PKG_RELEASE:= 2 PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe -PKG_DESCR:= tunnel TCP connections over ICMP packets +PKG_DESCR:= tunnel tcp connections over icmp packets PKG_SECTION:= net/security PKG_DEPENDS:= libpcap libpthread PKG_BUILDDEP:= libpcap -- cgit v1.2.3