fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-10 04:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into c++11

Browse Source 
Conflicts:
	src/core/manager.cc
	src/thread_base.cc
This commit is contained in:
Jari Sundell
2011-12-13 19:49:10 +09:00
parent 41d49b7c18 ee859a6137
commit 1fc70a733d
20 changed files with 60 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/thread_worker.cc
+1 -2
View File
@@ -62,8 +62,7 @@ ThreadWorker::~ThreadWorker() {
void
ThreadWorker::init_thread() {
m_pollManager = core::PollManager::create_poll_manager();
m_poll = core::create_poll();
m_state = STATE_INITIALIZED;
}