Merge pull request #85 from Nerei/master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:47:56 +0000 (20:47 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:47:56 +0000 (20:47 +0400)
1  2 
modules/core/src/parallel.cpp

Simple merge