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/tinyproxy/Makefile | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/tinyproxy/Makefile')
-rw-r--r-- | package/tinyproxy/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 612d60cbf..33a61509d 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= tinyproxy PKG_VERSION:= 1.8.3 PKG_RELEASE:= 2 PKG_MD5SUM:= eca927f7f6a9ce8394b2b256361978a7 -PKG_DESCR:= lightweight HTTP and HTTPS proxy +PKG_DESCR:= lightweight http and https proxy PKG_BUILDDEP:= autotool -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_URL:= https://www.banu.com/tinyproxy/ PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.8/ |