Alexander Alekhin bea2c75452 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-09-05 14:29:22 +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-08-30 16:22:42 +03:00
misc/java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-05-23 19:50:20 +03:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-09-05 14:29:22 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-09-05 14:29:22 +03:00
test	Fix modules/ typos	2019-08-16 17:34:29 +03:00
CMakeLists.txt	Merge pull request #14994 from terfendail:wintr_undistort	2019-07-18 19:32:51 +03:00