mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-08 23:44:23 +03:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 6 Branches 132 Tags
35a2f2fef911af0cd0eafd855754ea6e5ce2da90
Commit Graph
2 Commits
Author SHA1 Message Date
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-06 15:44:44 +04:00
Vladislav Vinogradov a0ae602bb7 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00