Alexander Alekhin 96b26dc8f4 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-02-20 19:47:27 +03:00
..
doc	Merge pull request #15388 from atinfinity:impl-turbo-colormap	2019-08-26 17:55:10 +03:00
include/opencv2	Merge pull request #16561 from vpisarev:better_hough_circles	2020-02-14 19:16:41 +03:00
misc/java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-10-05 15:45:31 +00:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-12 13:02:19 +03:00
src	imgproc: revert resize changes from PR 16497	2020-02-17 15:23:59 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-02-20 19:47:27 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-01-28 14:26:57 +03:00