Alexander Alekhin dca657a2fd Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-10 00:10:21 +03:00
..
doc	Misc. typos	2018-07-31 18:44:23 +03:00
include/opencv2	features2d: apply CV_OVERRIDE/CV_FINAL	2018-03-28 17:57:59 +03:00
misc	features2d: remove deprecated java wrappers	2018-05-16 16:13:18 +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	2018-09-10 00:10:21 +03:00
test	features2d(test): extract common extract/invariance test code	2018-09-07 19:30:51 +03:00
CMakeLists.txt	made flann dependency for features2d optional	2017-10-13 14:59:39 +03:00