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/transproxy | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/transproxy')
| -rw-r--r-- | package/transproxy/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/transproxy/Makefile b/package/transproxy/Makefile index 2db965c71..858e927f5 100644 --- a/package/transproxy/Makefile +++ b/package/transproxy/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= transproxy PKG_VERSION:= 1.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 02cc1160a9db9c49a40491f890083044 -PKG_DESCR:= transparent HTTP proxy -PKG_SECTION:= proxy +PKG_DESCR:= transparent http proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= iptables PKG_URL:= http://sourceforge.net/projects/transproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=transproxy/1.6/} |