Alexander Alekhin 3d14dd4e39 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-01-22 16:58:30 +03:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-09-05 14:29:22 +03:00
misc/java/test	related moved enums	2018-08-27 00:43:04 +03: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	2019-08-23 19:24:37 +03:00
CMakeLists.txt	Merge pull request #13300 from riju:photoModule	2018-12-09 15:08:59 +03:00