Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <a.alekhin@yadro.com>
Sat, 24 Dec 2022 13:54:58 +0000 (13:54 +0000)
committerAlexander Alekhin <a.alekhin@yadro.com>
Sat, 24 Dec 2022 13:54:58 +0000 (13:54 +0000)
1  2 
modules/calib3d/src/solvepnp.cpp
modules/core/src/parallel_impl.cpp

Simple merge
Simple merge