Alexander Alekhin 92b9888837 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-12-12 13:02:19 +03:00
..
doc	Merge pull request #15388 from atinfinity:impl-turbo-colormap	2019-08-26 17:55:10 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-12 13:02:19 +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	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-12 13:02:19 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-12 13:02:19 +03:00
CMakeLists.txt	Merge pull request #14994 from terfendail:wintr_undistort	2019-07-18 19:32:51 +03:00