Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 18 Feb 2013 11:35:42 +0000 (15:35 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 18 Feb 2013 11:35:42 +0000 (15:35 +0400)
commit262fc929aa9c31ee6dc88913279693acc1487ec0
tree0682f190ed7cb83b5839a81c57fa2a8ce01851ba
parentec7a7c0f7c80c7e4aaa6b28f82d9010497e5f145
parent7e5eee5bf1912e79c5b8e65ae454227bf745f4c3
Merge branch '2.4'
14 files changed:
CMakeLists.txt
android/scripts/ABI_compat_generator.py
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVFindLibsPerf.cmake
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/definitions/tocDefinitions.rst
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf4au/CMakeLists.txt
modules/gpu/src/cuda/matrix_reductions.cu
modules/gpu/test/test_core.cpp
modules/highgui/src/cap_ffmpeg.cpp
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/video/doc/motion_analysis_and_object_tracking.rst
modules/video/include/opencv2/video/tracking.hpp