Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Jul 2019 21:17:45 +0000 (21:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Jul 2019 21:17:45 +0000 (21:17 +0000)
commit097d81363befbce1bf922379a4ea886e5f6dbd2b
tree036bbd8abd463fc236ecd2cb88dfde365e0e6702
parent2bf87936323d68e66b14c4d1c89b07a753bec2f5
parent237007922096c3e33381ca8d0498c0d4b2e3c135
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVGenConfig.cmake
modules/calib3d/src/ptsetreg.cpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
modules/core/include/opencv2/core/matx.hpp
modules/dnn/test/test_backends.cpp
modules/features2d/src/fast.cpp
modules/imgproc/src/canny.cpp
modules/imgproc/src/contours.cpp
modules/imgproc/src/templmatch.cpp