projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5c202e f85e33f)
Merge pull request #7266 from alalek:pr7159
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 16 Sep 2016 21:18:26 +0000 (21:18 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 16 Sep 2016 21:18:26 +0000 (21:18 +0000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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