Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 24 Jul 2018 19:48:54 +0000 (22:48 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 24 Jul 2018 19:48:54 +0000 (22:48 +0300)
commit9787ab598b6609a6ca6652a12441d741cb15f695
tree6133914dbebf1c6341719e37bbc2326bb510f220
parent7e9b5d9e30180f291d1861aaabec6eabc9876049
parent5336b9ad19bdbc0f4d913933074455554351b298
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/calib3d/src/circlesgrid.cpp
modules/core/include/opencv2/core/types.hpp
modules/core/test/test_mat.cpp
modules/imgproc/src/drawing.cpp
modules/ml/src/ann_mlp.cpp
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/videoio/src/cap_v4l.cpp
modules/videoio/src/videoio_registry.cpp