Merge branch 'master' into xirvik

This commit is contained in:
rakshasa
2013-08-26 23:17:56 +09:00
56 changed files with 324 additions and 388 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ Control::Control() :
m_viewManager = new core::ViewManager();
m_dhtManager = new core::DhtManager();
m_inputStdin->slot_pressed(sigc::mem_fun(m_input, &input::Manager::pressed));
m_inputStdin->slot_pressed(std::tr1::bind(&input::Manager::pressed, m_input, std::tr1::placeholders::_1));
m_taskShutdown.slot() = std::tr1::bind(&Control::handle_shutdown, this);