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
test_blend.cpp
test_canny.cpp
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
test_gftt.cpp
test_histogram.cpp
test_hough.cpp
test_main.cpp
test_match_template.cpp
test_mean_shift.cpp
test_precomp.hpp