projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db5f1c3
5012fc5
)
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
author
Alexander Alekhin
<alexander.a.alekhin@gmail.com>
Fri, 28 Feb 2020 18:34:37 +0000
(18:34 +0000)
committer
Alexander Alekhin
<alexander.a.alekhin@gmail.com>
Fri, 28 Feb 2020 18:34:37 +0000
(18:34 +0000)
1
2
cmake/OpenCVCompilerOptions.cmake
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/include/opencv2/core/mat.inl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/highgui/src/window_QT.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/videoio/src/cap_v4l.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmake/OpenCVCompilerOptions.cmake
Simple merge
diff --cc
modules/core/include/opencv2/core/mat.inl.hpp
Simple merge
diff --cc
modules/highgui/src/window_QT.cpp
Simple merge
diff --cc
modules/videoio/src/cap_v4l.cpp
Simple merge