Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 24 Apr 2018 15:13:06 +0000 (18:13 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 24 Apr 2018 15:13:06 +0000 (18:13 +0300)
commitcd2b188c9a55c3b2b2fbfb16493cfbb6532ab0b4
tree5b22629f1607bc245f6f8097b27ac66d9f85c60d
parent1e0a60be2a4006612533fea6c3334e5797ab4a43
parentca1975cadaf0391c330b58d2f3633d8b5327520c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/calib3d/src/circlesgrid.cpp
modules/core/include/opencv2/core/base.hpp
modules/core/src/parallel.cpp
modules/core/src/system.cpp
modules/imgproc/src/precomp.hpp
modules/imgproc/src/smooth.cpp
modules/ml/test/test_mltests2.cpp