projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51e5430 c6a9de8)
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 14 May 2018 12:17:35 +0000 (15:17 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 14 May 2018 12:17:35 +0000 (15:17 +0300)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Domain: Multimedia / Media Vision;