Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 19 Jun 2020 07:33:50 +0000 (07:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 19 Jun 2020 07:33:50 +0000 (07:33 +0000)
commite3d502310f6ae0cad79f3474b9ea2b25705985f9
tree6e708657e16c329c014e1d70d106217d0fc7e4f8
parent9ba5581d176baf7c8fceb12b4dcef6c49c7a087d
parentcb54f4c2ecf991a686b2076cc3a8d968dc3c5144
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVDetectCUDA.cmake
cmake/templates/cvconfig.h.in
modules/dnn/src/layers/region_layer.cpp
platforms/android/build_sdk.py