Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 23 Apr 2018 14:54:04 +0000 (17:54 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 23 Apr 2018 15:45:02 +0000 (18:45 +0300)
commit4d7d630e925bad6a7b1584c7d792b938faf0829b
tree2e3dbedcf05bf50abe9928d8e3bb091b40883045
parent4b2d1aaeea52e07dff6e925a86313bd3c2f66e8b
parente82af627ed227dc50952bdcaeebf8306f8d38ccb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/private.hpp
modules/core/src/arithm.cpp
modules/core/src/system.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/smooth.cpp
modules/stitching/src/blenders.cpp