mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
d156f5af6d
opencv/modules/cuda
History
Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-07 14:59:34 +04:00
include/opencv2 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf moved BufferPool management functions to public 2013-10-08 17:21:22 +04:00
src fix bug #3544: 2014-02-18 10:45:47 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00