projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcbed8d 789dc0a)
Merge pull request #8231 from paroj:pytype
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 27 Feb 2017 11:17:01 +0000 (11:17 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 27 Feb 2017 11:17:02 +0000 (11:17 +0000)
1  2 
modules/python/src2/cv2.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/python/src2/cv2.cpp
Simple merge
Domain: Multimedia / Media Vision;