diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/ptunnel | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/ptunnel')
| -rw-r--r-- | package/ptunnel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |