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/6tunnel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/6tunnel') diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index b34909e5b..ea6f97e03 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= 6tunnel PKG_VERSION:= 0.11rc2 PKG_RELEASE:= 1 PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449 -PKG_DESCR:= IPv4/IPv6 tunnel proxy -PKG_SECTION:= ipv6 +PKG_DESCR:= ipv4/ipv6 tunnel proxy +PKG_SECTION:= net/ipv6 PKG_BUILDDEP:= autotool PKG_URL:= http://toxygen.net/6tunnel/ PKG_SITES:= http://toxygen.net/6tunnel/ -- cgit v1.2.3