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/socat | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/socat')
| -rw-r--r-- | package/socat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/socat/Makefile b/package/socat/Makefile index 96a9592f4..51e3b35dd 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= socat PKG_VERSION:= 1.7.2.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a15dc3362f49d543abdbacc267d0a41 -PKG_DESCR:= A multipurpose relay (SOcket CAT) +PKG_DESCR:= multipurpose relay PKG_SECTION:= net/misc PKG_DEPENDS:= libpthread PKG_URL:= http://www.dest-unreach.org/socat/ |