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/polipo | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/polipo')
| -rw-r--r-- | package/polipo/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/polipo/Makefile b/package/polipo/Makefile index 9422a4960..d4589a5ad 100644 --- a/package/polipo/Makefile +++ b/package/polipo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= polipo PKG_VERSION:= 1.0.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= bfc5c85289519658280e093a270d6703 -PKG_DESCR:= HTTP 1.1 proxy with Socks5 support -PKG_SECTION:= proxy +PKG_DESCR:= web proxy with socks5 support +PKG_SECTION:= net/proxy PKG_URL:= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/ PKG_SITES:= http://freehaven.net/~chrisd/polipo/ |