Alexander Alekhin 7d66f1e391 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2021-05-18 18:06:26 +00:00
..
3rdparty/SoftFloat	Add install component for 3rdparty libraries licenses	2018-03-06 16:32:30 +03:00
cmake/parallel	core(parallel): plugins support	2021-02-15 17:07:36 +00:00
doc	Merge pull request #18073 from vpisarev:apache2_license	2020-08-17 11:49:11 +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 #20092 from komakai:disable_swift_build	2021-05-18 17:10:51 +03:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-04-08 11:23:24 +00:00
src	Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat	2021-05-14 16:48:50 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-05-18 18:06:26 +00:00
CMakeLists.txt	core(parallel): fix plugins handling if no filesystem available	2021-03-18 23:05:12 +00:00