Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 29 Dec 2021 15:22:13 +0000 (15:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 29 Dec 2021 15:22:13 +0000 (15:22 +0000)
1  2 
modules/core/src/ocl.cpp
samples/_winpack_run_python_sample.cmd

Simple merge