Alexander Alekhin fcec053d59 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-02-05 19:12:41 +03:00
..
doc	Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016	2018-11-10 20:11:28 +03:00
include/opencv2	move legacy C-API constants into separate files	2018-11-17 23:47:51 +00:00
misc/java	related moved enums	2018-08-27 00:43:04 +03:00
perf	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-02-05 19:12:41 +03:00
test	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
CMakeLists.txt	build: fix js build (make video->calib3d dependency optional)	2018-08-31 14:29:25 +03:00