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/rtorrent/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/rtorrent') diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 0b43597d1..0148dde08 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 72c3e9ab859bda7cc8aa96c0b508b09f PKG_DESCR:= console torrent application -PKG_SECTION:= p2p +PKG_SECTION:= app/p2p PKG_DEPENDS:= libncurses libtorrent libcurl libstdcxx PKG_BUILDDEP:= autotool ncurses libtorrent curl PKG_URL:= http://libtorrent.rakshasa.no/ -- cgit v1.2.3