Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
commit000a13b6a35f65eb04e5c78721364406718f5d81
tree1566fc2a1da50c9f8f961f3b599c2e937097a415
parent84b3b5b4a404565ffa98ab553ae13b77a3ad60df
parent9fa01a7b7027eb0edbbdf02b3f687d2592071f77
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/src/parallel.cpp
modules/stitching/src/blenders.cpp