Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 4 Jul 2021 21:24:40 +0000 (21:24 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 4 Jul 2021 21:24:40 +0000 (21:24 +0000)
commitd60bb57d4b66c576045666dd7336723f61a18b0f
tree21fb219911960171f8b40d0d298cf03f29b64b2d
parent85dde8a800fdb8c4b92bd9088174079cc5a4d416
parentf9d62fba7af573d6085b9a34f9d4879d664497f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVCompilerOptions.cmake