Merge remote-tracking branch 'origin/master' into xirvik

This commit is contained in:
rakshasa
2014-05-09 18:05:56 +09:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
AC_INIT(rtorrent, 0.9.3, sundell.software@gmail.com)
AC_INIT(rtorrent, 0.9.4, sundell.software@gmail.com)
AC_DEFINE(API_VERSION, 8, api version)
@@ -45,7 +45,7 @@ PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
LIBS="$LIBS $libcurl_LIBS")
PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.3,
PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.4,
CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS";
LIBS="$LIBS $libtorrent_LIBS")
+1 -1
View File
@@ -53,7 +53,7 @@ class lt_cacheline_aligned SCgi : public torrent::Event {
public:
typedef rak::function2<bool, const char*, uint32_t> slot_write;
static const int max_tasks = 30;
static const int max_tasks = 100;
// Global lock:
SCgi() : m_logFd(-1) {}