Alexander Alekhin 593af7287b Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-05-18 17:50:16 +00:00
..
doc	add DeepGreen colormap	2020-05-12 15:24:32 +03:00
include/opencv2	Merge pull request #15214 from jumostedu:matchtemplmask	2020-05-14 22:46:25 +00:00
misc/java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-02-26 20:09:03 +03:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-05-18 17:50:16 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-05-18 17:50:16 +00:00
test	Merge pull request #15214 from jumostedu:matchtemplmask	2020-05-14 22:46:25 +00:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-05-18 17:50:16 +00:00