projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0647774 a3f3fbe)
Merge pull request #18756 from andy-held:add_ueye_capture
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Nov 2020 22:28:54 +0000 (22:28 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Nov 2020 22:28:54 +0000 (22:28 +0000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
modules/videoio/cmake/init.cmake patch | diff1 | diff2 | blob | history
modules/videoio/include/opencv2/videoio.hpp patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc modules/videoio/cmake/init.cmake
Simple merge
Domain: Multimedia / Media Vision;