mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-02 03:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,717 Commits 6 Branches 129 Tags 3.6 GiB
e0841f3d6e
Commit Graph

2 Commits

Author SHA1 Message Date
Roman Donchenko
2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
 2014-02-03 13:23:59 +04:00
Vladislav Vinogradov
6d216d78d9 renamed gpulegacy -> cudalegacy 2013-09-02 14:00:42 +04:00