Alexander Alekhin 7722a2b8a8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-06-04 17:58:34 +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	2020-04-24 19:02:39 +00:00
misc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-06-04 17:58:34 +00:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-24 19:02:39 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-05-12 19:24:28 +00:00
test	Merge pull request #17317 from Yosshi999:prevent-build-failure-without-flann	2020-05-19 08:30:54 +00:00
CMakeLists.txt	features2d(sift): enable runtime dispatching	2020-05-03 11:59:27 +00:00