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
..
cuda
bilateral_filter.cpp
blend.cpp
canny.cpp
color.cpp
corners.cpp
cvt_color_internal.h
generalized_hough.cpp
gftt.cpp
histogram.cpp
hough_circles.cpp
hough_lines.cpp
hough_segments.cpp
match_template.cpp
mean_shift.cpp
mssegmentation.cpp
precomp.hpp