Alexander Alekhin 1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-11-10 20:50:26 +00:00
..
doc	Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016	2018-11-10 20:11:28 +03:00
include/opencv2	Merge pull request #13084 from vpisarev:shuffle_optflow_algos	2018-11-09 17:52:06 +03:00
misc/java	related moved enums	2018-08-27 00:43:04 +03:00
perf	Merge pull request #13084 from vpisarev:shuffle_optflow_algos	2018-11-09 17:52:06 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-10 20:50:26 +00:00
test	Merge pull request #13084 from vpisarev:shuffle_optflow_algos	2018-11-09 17:52:06 +03:00
CMakeLists.txt	build: fix js build (make video->calib3d dependency optional)	2018-08-31 14:29:25 +03:00