Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/src/gl_core_3_1.cpp modules/core/src/opencl/convert.cl modules/cudaimgproc/src/cuda/canny.cu modules/cudastereo/perf/perf_stereo.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/test/test_denoising.cpp modules/ocl/src/opencl/imgproc_resize.cl samples/cpp/Qt_sample/main.cpp		2014-02-17 15:24:05 +04:00
..
perf_bilateral_filter.cpp
perf_blend.cpp
perf_canny.cpp
perf_color.cpp
perf_corners.cpp
perf_gftt.cpp
perf_histogram.cpp
perf_hough.cpp
perf_main.cpp
perf_match_template.cpp
perf_mean_shift.cpp
perf_precomp.hpp