projects / profile / ivi / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cb21d2 15b7b01)
Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:32:19 +0000 (20:32 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:32:19 +0000 (20:32 +0400)
1  2 
cmake/OpenCVCompilerOptions.cmake patch | diff1 | diff2 | blob | history
modules/core/src/matrix.cpp patch | diff1 | diff2 | blob | history
modules/core/src/parallel.cpp patch | diff1 | diff2 | blob | history
modules/flann/src/miniflann.cpp patch | diff1 | diff2 | blob | history

diff --cc cmake/OpenCVCompilerOptions.cmake
Simple merge
diff --cc modules/core/src/matrix.cpp
Simple merge
diff --cc modules/core/src/parallel.cpp
Simple merge
diff --cc modules/flann/src/miniflann.cpp
Simple merge
Domain: Multimedia / Uncategorized;