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)
commit8dbde3297eead00a07f76498346816b56605609d
treea89b48462d096b0ed29eb8b2a9b5db6a8c4e3f63
parent1cb21d292bac4a5ac0ce88984b049515b1c77c05
parent15b7b01243188e4cada6b9b853186cc74b322a36
Merge branch '2.4'
cmake/OpenCVCompilerOptions.cmake
modules/core/src/matrix.cpp
modules/core/src/parallel.cpp
modules/flann/src/miniflann.cpp