opencv/modules/nonfree/test
Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
..
test_detectors.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test_features2d.cpp fixed warnings 2013-10-08 12:46:43 +04:00
test_keypoints.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
test_main.cpp fixed nonfree test (run it only on one gpu device) 2013-04-02 13:24:39 +04:00
test_precomp.hpp replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
test_rotation_and_scale_invariance.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
test_surf.cuda.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
test_surf.ocl.cpp fixing typo 2013-10-25 18:00:46 +04:00