projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5fbb4f a4a47b5)
Merge pull request #9130 from alalek:android_define
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Jul 2017 17:17:24 +0000 (17:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Jul 2017 17:17:24 +0000 (17:17 +0000)
1  2 
modules/core/src/stat.cpp patch | diff1 | diff2 | blob | history
modules/core/test/ocl/test_arithm.cpp patch | diff1 | diff2 | blob | history
modules/imgproc/src/filter.cpp patch | diff1 | diff2 | blob | history
modules/imgproc/src/morph.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/core/src/stat.cpp
Simple merge
diff --cc modules/core/test/ocl/test_arithm.cpp
Simple merge
diff --cc modules/imgproc/src/filter.cpp
Simple merge
diff --cc modules/imgproc/src/morph.cpp
Simple merge
Domain: Multimedia / Media Vision;