Alexander Alekhin 11b020b9f9 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-06-10 19:05:28 +00:00
..
doc	Misc. typos	2018-07-31 18:44:23 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
misc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +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	2019-06-10 19:05:28 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-12-27 18:15:50 +03:00
CMakeLists.txt	build: avoid highgui dependency	2019-04-15 18:59:51 +00:00