Alexander Alekhin 11eff8bae0 Merge pull request #18014 from lpea:fix_build_with_aravis		2020-08-03 18:26:53 +00:00
..
cmake	Fix the detection of the XIMEA library (since its location may be different when the version of the ximea software is updated)	2020-06-20 16:47:18 +02:00
doc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-24 19:02:39 +00:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-07-28 17:25:20 +00:00
misc	Add Objective-C/Swift wrappers for opencv_contrib modules	2020-07-21 19:19:08 +09:00
perf	Merge pull request #15100 from Volskig:cam_multiplexing_function_v	2019-11-15 19:42:12 +03:00
src	videoio: fix compilation with Aravis enabled	2020-08-02 14:27:44 +02:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-07-28 17:25:20 +00:00
CMakeLists.txt	Merge pull request #17165 from komakai:objc-binding	2020-06-08 18:32:53 +00:00