From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/vtun/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/vtun') diff --git a/package/vtun/Makefile b/package/vtun/Makefile index f9bfff23f..6d7edb7c9 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= vtun PKG_VERSION:= 3.0.1 PKG_RELEASE:= 1 PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b -PKG_DESCR:= A VPN tunnel daemon +PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net/misc -PKG_DEPENDS:= zlib libopenssl liblzo kmod-tun +PKG_DEPENDS:= zlib libopenssl liblzo PKG_BUILDDEP:= zlib openssl liblzo PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} -- cgit v1.2.3