Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 25 Jan 2013 12:30:36 +0000 (16:30 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 25 Jan 2013 12:30:36 +0000 (16:30 +0400)
commitf4e27bcbbc8f18977d585a6bdf6473c0dbb07a42
tree869b4a719325af3a51d3e58c2724c6e2a545e5e4
parent048706796405c13f52177f2216b97cba13d862f7
parentd8f749da5212ce0fe9d840e7d0d938895441fdd0
Merge branch '2.4'
CMakeLists.txt
doc/user_guide/ug_mat.rst
modules/core/include/opencv2/core/version.hpp
modules/gpu/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/imgproc/perf/perf_resize.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ts/include/opencv2/ts/ts.hpp
modules/ts/src/ts_perf.cpp