projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a456c5 cdc10de)
Merge pull request #2093 from SpecLad:merge-2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 30 Dec 2013 20:26:22 +0000 (00:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 30 Dec 2013 20:26:22 +0000 (00:26 +0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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