Alexander Alekhin 735a79ae83 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-06-19 18:44:16 +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-06-09 10:58:37 +00:00

misc

Merge pull request #20221 from komakai:java-at-function

2021-06-08 18:45:38 +00:00

perf

UMat usageFlags fixes opencv/opencv#19807

2021-06-03 16:33:03 +02:00

src

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

2021-06-19 18:44:16 +00:00

test

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

2021-06-19 18:44:16 +00:00

CMakeLists.txt

core(parallel): fix plugins handling if no filesystem available

2021-03-18 23:05:12 +00:00