Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Feb 2013 13:33:30 +0000 (17:33 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Feb 2013 13:33:30 +0000 (17:33 +0400)
commit0b8a6da817942ea2d6b107d40ea13da7cc828cef
tree8ecaac109955e626f81671b4169ecf601b600e39
parent0ccdc5b4af395a3581f3e76ce77c6502c4015f74
parente6dd4e840d53b20b677706fc55cbdacd59e148cd
Merge branch '2.4'
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/gpumat.hpp
modules/core/src/gpumat.cpp
modules/gpu/doc/feature_detection_and_description.rst
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/include/opencv2/highgui/highgui.hpp
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/imgproc/perf/perf_cvt_color.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/src/mcwutil.cpp