projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cead19 e5041ab)
Merge pull request #7741 from alalek:cmake_remove_legacy_pkgconfig
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 20:55:29 +0000 (20:55 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 20:55:29 +0000 (20:55 +0000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
cmake/OpenCVUtils.cmake patch | diff1 | diff2 | blob | history

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