Roman Donchenko cdc10defa3 Merge commit '05b9c991dd' into merge-2.4 ...

Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp

2013-12-30 17:30:59 +04:00

..

perf_arithm.cpp

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +04:00

perf_core.cpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

perf_element_operations.cpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

perf_main.cpp

renamed gpuarithm -> cudaarithm

2013-09-02 14:00:42 +04:00

perf_precomp.hpp

replaced gpu->cuda in files names

2013-09-02 14:00:44 +04:00

perf_reductions.cpp

used new device layer for cv::gpu::integral

2013-10-01 12:18:39 +04:00