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/tinc | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/tinc')
| -rw-r--r-- | package/tinc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 0579435f3..62ae2d02d 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= tinc PKG_VERSION:= 1.0.23 PKG_RELEASE:= 1 PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f -PKG_DESCR:= VPN tunnel daemon +PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo libopenssl PKG_BUILDDEP:= zlib liblzo openssl |