Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:00:05 +0000 (15:00 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:00:05 +0000 (15:00 +0400)
commit5bc104cef50c79a68ef342f7057d1362fda51d28
treef7c0a412265a86cb83dd188652840be59cc6cc6c
parent0e7ca71dcc1b53430893362faf302c05c8695524
parent09abcd567e11924985b374ae9a4935051aeb9cb7
Merge branch '2.4'
modules/core/src/parallel.cpp