Alexander Alekhin 2c6f1ab57d Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-11-06 20:04:31 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-10-26 17:56:55 +03:00
misc	Generate enum bindings automatically	2018-09-28 15:39:51 +09:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-06 20:04:31 +00:00
test	Merge pull request #12138 from wanghanmin:wanghanmin-patch-videoio_crossbarsetting-1	2018-10-25 19:41:37 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00