3 Commits

Author	SHA1	Message	Date
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
Vladislav Vinogradov	fd88654b45	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
Vladislav Vinogradov	dcd600cc47	renamed gpuarithm -> cudaarithm	2013-09-02 14:00:42 +04:00