Alexander Alekhin 0d7f770996 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-11-04 09:58:29 +00:00
..
doc	Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016	2018-11-10 20:11:28 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-02-26 17:34:42 +03:00
misc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-13 20:00:54 +00:00
perf	video(DIS): use OpenCL shared mem	2019-05-03 18:58:26 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-11-04 09:58:29 +00:00
test	Merge pull request #14473 from alalek:video_dis_update_opencl	2019-05-29 14:22:21 +03:00
CMakeLists.txt	build: fix js build (make video->calib3d dependency optional)	2018-08-31 14:29:25 +03:00