mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-01 04:03:49 +03:00
Code Issues Packages Projects Releases Wiki Activity
13,236 Commits 6 Branches 132 Tags
493679dc56fe4e3cb2cfee32e280cb01b40db284
Commit Graph
3 Commits
Author SHA1 Message Date
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
Vladislav Vinogradov fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov 5660d6a680 renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00