Alexander Alekhin 3d14dd4e39 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-01-22 16:58:30 +03:00
..
include/opencv2	Fix modules/ typos	2019-08-15 18:02:09 -04:00
misc/java/test	java: test: use assertNotNull and assertFalse	2019-05-24 10:45:09 +02:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-01-22 16:58:30 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-01-22 16:58:30 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-19 15:43:58 +03:00