projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 978f387 97eaddd)
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Oct 2020 14:41:08 +0000 (14:41 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Oct 2020 14:41:08 +0000 (14:41 +0000)
1  2 
cmake/OpenCVUtils.cmake patch | diff1 | diff2 | blob | history
modules/objdetect/src/qrcode.cpp patch | diff1 | diff2 | blob | history

diff --cc cmake/OpenCVUtils.cmake
Simple merge
diff --cc modules/objdetect/src/qrcode.cpp
Simple merge
Domain: Multimedia / Media Vision;