Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
..
2013-07-18 15:39:42 +04:00
2013-07-18 15:39:42 +04:00
2013-08-21 18:59:25 +04:00
2013-07-17 11:41:48 +04:00
2013-08-21 18:59:25 +04:00
2013-08-27 13:26:44 +04:00
2013-06-14 17:25:57 +04:00
2010-11-17 12:49:53 +00:00