Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Jun 2014 09:43:28 +0000 (13:43 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Jun 2014 09:43:28 +0000 (13:43 +0400)
commit33087f9eaa46dbd816f9076365e7c765bb31a83d
tree7ff0c37ccefd49eb8b3b1278f5c7d0353193bf71
parentabe37659ccfc2b399e7543eee1a43900c9a7099e
parent9a5e9d344230d8278d841e706e2196a38ab3c5f2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
modules/core/test/test_math.cpp
modules/imgproc/src/contours.cpp
modules/imgproc/test/test_imgwarp_strict.cpp
modules/ml/src/em.cpp