Philippe FOUBERT 0eb7060205 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

..

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-06-04 17:58:34 +00:00

misc

Merge pull request #17165 from komakai:objc-binding

2020-06-08 18:32:53 +00:00

perf

…

src

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

2020-06-04 17:58:34 +00:00

test

videoio: added plug-in support to MSMF backend

2020-04-08 15:22:50 +03:00

CMakeLists.txt

Merge pull request #17165 from komakai:objc-binding

2020-06-08 18:32:53 +00:00