Alexander Alekhin 45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ...

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.

2018-06-04 19:26:10 +03:00

..

doc

Eliminated use of obsolete 'register' keyword

2016-10-20 20:19:14 -04: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

Misc. modules/ cont. pt2

2018-02-13 11:28:11 -05:00

src

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-06-04 19:26:10 +03:00

test

features2d: add verbose messages into tests

2018-02-28 19:47:16 +00:00

CMakeLists.txt

made flann dependency for features2d optional

2017-10-13 14:59:39 +03:00