projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b05789f 164a41b)
Merge pull request #9457 from alalek:type_traits_issue_7599
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 6 Sep 2017 13:34:28 +0000 (13:34 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 6 Sep 2017 13:34:29 +0000 (13:34 +0000)
1  2 
cmake/OpenCVUtils.cmake patch | diff1 | diff2 | blob | history
modules/core/CMakeLists.txt patch | diff1 | diff2 | blob | history
modules/python/src2/cv2.cpp patch | diff1 | diff2 | blob | history

diff --cc cmake/OpenCVUtils.cmake
Simple merge
diff --cc modules/core/CMakeLists.txt
Simple merge
diff --cc modules/python/src2/cv2.cpp
Simple merge
Domain: Multimedia / Media Vision;