From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/squid/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/squid') diff --git a/package/squid/Makefile b/package/squid/Makefile index c6be547fe..502f3bd51 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.4.5 PKG_RELEASE:= 1 PKG_MD5SUM:= a831efb36cfbaa419f8dc7a43cba72c9 PKG_DESCR:= web and cache proxy -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl PKG_BUILDDEP:= autotool openssl libtool PKG_URL:= http://www.squid-cache.org/ -- cgit v1.2.3