opencv

History

Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt

2014-02-03 13:23:59 +04:00

cmake_uninstall.cmake.in

Normalized file endings.

2013-08-21 18:59:25 +04:00

cvconfig.h.in

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-23 18:50:17 +04:00

opencv_modules.hpp.in

Normalized file endings.

2013-08-21 18:59:25 +04:00

opencv_run_all_tests.sh.in

Reports path fix for opencv_run_all_tests.sh.in script.