projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 772a818 f0c2da3)
Merge pull request #8753 from RyuheiMori:fix-cpu-feature-detection-on-android
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 12 Jun 2017 16:08:08 +0000 (16:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 12 Jun 2017 16:08:08 +0000 (16:08 +0000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
modules/core/src/system.cpp patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc modules/core/src/system.cpp
Simple merge
Domain: Multimedia / Media Vision;