Merge remote-tracking branch 'upstream/3.4' into merge-3.4

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVDetectCUDA.cmake
Simple merge
diff --cc modules/core/include/opencv2/core/mat.hpp
Simple merge
diff --cc modules/core/include/opencv2/core/mat.inl.hpp
Simple merge
diff --cc modules/core/src/parallel.cpp
Simple merge
diff --cc modules/stitching/src/blenders.cpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 3 May 2018 14:30:38 +0000 (14:30 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVDetectCUDA.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/src/parallel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/blenders.cpp	patch \|	diff1 \|	diff2 \|	blob \| history