Alexander Alekhin afe9993376 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-07-28 17:25:20 +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

Dynamic build for Objective-C/Swift wrapper

2020-06-26 08:26:05 +09:00

perf

Merge pull request #15100 from Volskig:cam_multiplexing_function_v

2019-11-15 19:42:12 +03:00

src

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-07-28 17:25:20 +00: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