Alexander Alekhin 8c0b0714e7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-03-11 19:20:22 +00:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-03-11 19:20:22 +00:00
misc/java/test	java(test): fix test names	2018-01-12 19:14:00 +00: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	2019-03-11 19:20:22 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-02 05:33:35 +00:00
CMakeLists.txt	Merge pull request #13253 from alalek:fix_13201	2018-11-23 20:02:46 +03:00