opencv/modules/cudaimgproc/test
Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
test_bilateral_filter.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_blend.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_canny.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
test_corners.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_gftt.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_histogram.cpp fixed docs 2013-09-02 14:00:44 +04:00
test_hough.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_main.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_match_template.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_mean_shift.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_precomp.hpp replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00