Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 25 Jan 2021 22:34:41 +0000 (22:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 25 Jan 2021 22:42:13 +0000 (22:42 +0000)
commite85b41f9be29e9529fbb1bd9e218756274aa0ed1
tree4802e57e28e2bff2a677f17b9e426214059c8dec
parentf54f6627c33108e8c6b2b44da17245a92b41ab6b
parent573812d0ffc15d7f5f0664ae0b1acac9f0cfb21c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/ocl.cpp
modules/dnn/misc/python/test/test_dnn.py
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/highgui/src/window_w32.cpp
modules/python/src2/cv2.cpp
modules/python/test/test_misc.py