Alexander Alekhin 7d66f1e391 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-05-18 18:06:26 +00:00

..

include/opencv2

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-05-18 18:06:26 +00:00

misc

Merge pull request #18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds

2020-11-19 21:20:32 +00:00

perf

Merge pull request #11897 from Jakub-Golinowski:hpx_backend

2018-08-31 16:23:26 +03:00

src

Fix OpenCV build with OpenEXR before 2.2.0.

2021-04-29 09:50:30 +03:00

test

Merge pull request #19780 from HarryDC:feature/index-multiimage-tiff

2021-04-23 20:48:32 +00:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-02-21 20:14:09 +00:00