projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee1e1ce 087e930)
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 29 Aug 2018 13:24:56 +0000 (16:24 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 29 Aug 2018 13:24:56 +0000 (16:24 +0300)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
modules/core/test/test_arithm.cpp patch | diff1 | diff2 | blob | history
modules/python/src2/cv2.cpp patch | diff1 | diff2 | blob | history
modules/shape/src/aff_trans.cpp patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc modules/core/test/test_arithm.cpp
Simple merge
diff --cc modules/python/src2/cv2.cpp
Simple merge
diff --cc modules/shape/src/aff_trans.cpp
Simple merge
Domain: Multimedia / Media Vision;