Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 10 Jan 2019 09:29:41 +0000 (12:29 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 10 Jan 2019 09:29:41 +0000 (12:29 +0300)
commit7e2ebecd52232d02e2d53f3e073c076be73e3470
treed6ec95e21e79ef2d39e6fa2f42a391212b32d707
parent581d0ef8a910a9a5f2d5e87960db4dc5539ccb9e
parent054bd23a4301e8a07e8abe0ce88d027c5c6e394f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/cuda/functional.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/src/merge.cpp
modules/core/test/test_mat.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/imgproc/include/opencv2/imgproc.hpp