Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 13:10:07 +0000 (17:10 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 13:10:07 +0000 (17:10 +0400)
commit13b6a3a15ed15a5bf679cf1c9502786656166c1a
tree85f8157cee131a48efbb3daf8aa200ecd166fcca
parent2128bd25e46e86e3dc49f2175db7bd018322800a
parent014a500f79f61c4189c5b4bf55db0e78a4ae6b73
Merge branch 2.4
CMakeLists.txt
modules/core/include/opencv2/core/operations.hpp
modules/core/src/command_line_parser.cpp
modules/core/src/matrix.cpp
modules/features2d/src/matchers.cpp
modules/videostab/src/inpainting.cpp