Alexander Alekhin ca9756f6a1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-04-13 20:00:12 +00:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-02-10 19:40:29 +03: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-04-13 20:00:12 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-02 21:52:32 +00:00
CMakeLists.txt	Merge pull request #16494 from StefanBruens:jpeg2000_openjpeg_port	2020-03-27 07:18:58 +00:00