Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 31 Jan 2021 17:44:15 +0000 (17:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 31 Jan 2021 17:44:15 +0000 (17:44 +0000)
commit2b787eb4b8b7f3efef5439d8052976e01d0b0019
treeba903c50a82130f888b54a922a7bd85c0b83193d
parente250bae356f2a69026c8b24524fc0d768e180dbf
parent5ab4623c2aa3b3eb936a0f2c804d9251fdee01a4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
modules/core/include/opencv2/core/utils/tls.hpp
modules/python/src2/cv2.cpp