Alexander Alekhin 1dee705074 Merge branch '3.4' into merge-3.4		2018-12-22 05:40:15 +00:00
..
doc	videoio: drop obsolete backends	2018-11-07 19:49:09 +03:00
include/opencv2	Merge pull request #13341 from UnaNancyOwen:fix_librealsense	2018-12-05 20:12:25 +03:00
misc	Generate enum bindings automatically	2018-09-28 15:39:51 +09:00
perf	videoio: drop obsolete backends	2018-11-07 19:49:09 +03:00
src	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
test	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-12-18 19:07:43 +00:00