Commit f7b192be authored by Pavel Vainerman's avatar Pavel Vainerman

Merge commit 'origin/master' into eterbook

parents 3779a007 0009da44
......@@ -47,7 +47,7 @@ int main(int argc, char **argv)
}
IOControl* ic = IOControl::init_iocontrol(argc,argv,shmID);
IOControl* ic = IOControl::init_iocontrol(argc,argv,shmID,0);
if( !ic )
{
dlog[Debug::CRIT] << "(iocontrol): init ۣ..." << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment