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/libtorrent/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libtorrent/Makefile') diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 4e68e3211..c6143d858 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.13.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 96c0b81501357df402ab592f59ecaeab PKG_DESCR:= bittorrent library -PKG_SECTION:= libs +PKG_SECTION:= libs/net PKG_DEPENDS:= libopenssl libsigc++ PKG_BUILDDEP:= openssl libsigc++ gettext-tiny PKG_URL:= http://libtorrent.rakshasa.no/ -- cgit v1.2.3