Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Jun 2021 10:58:37 +0000 (10:58 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Jun 2021 10:58:37 +0000 (10:58 +0000)
commitbc1af6227a9fc605ea34319eead655c415120f91
tree3ca5b6764c4cb07782d54df2399fc10013a31125
parent4c2dff88de606f2c2337bc7816fbe463a4b9013f
parent2b84c97a78fdac8aa692301d5fca4ba695d9d2ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/types_c.h
modules/python/package/cv2/__init__.py