Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 22 May 2018 16:02:01 +0000 (19:02 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 22 May 2018 16:02:01 +0000 (19:02 +0300)
commit5e68f35500a859838ab8688bd3487cf9edece3f7
tree1c9bb3b896cff395c02b995953bed8c123938e24
parentba1bd64bf9982e984c5b74ed0a8531d09eee3127
parent2f9b4439af598fc57170e7edf00eeea978f827df
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectInferenceEngine.cmake