Skip to content

O
opencv
Switch branch/tag
History Find file
  • Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 2d6f35d6
    Roman Donchenko authored 
    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
    2d6f35d6
Name
Last commit
 Last update
..
interpolation.hpp Loading commit data...
test_main.cpp Loading commit data...
test_precomp.cpp Loading commit data...
test_precomp.hpp Loading commit data...
test_pyramids.cpp Loading commit data...
test_remap.cpp Loading commit data...
test_resize.cpp Loading commit data...
test_warp_affine.cpp Loading commit data...
test_warp_perspective.cpp Loading commit data...