projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e8846b 9d13c7b)
Merge pull request #3216 from xantares:patch-1
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 2 Oct 2014 13:25:06 +0000 (13:25 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 2 Oct 2014 13:25:06 +0000 (13:25 +0000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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