mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 14:59:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
baee8c3aa5
opencv/modules/ocl
History
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
doc Merge pull request #2034 from pentschev:ocl_features2d_orb_master 2013-12-27 15:49:28 +04:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
perf Merge pull request #2034 from pentschev:ocl_features2d_orb_master 2013-12-27 15:49:28 +04:00
src Merge commit '0566ab4d3d' into merge-2.4 2013-12-30 16:51:46 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
CMakeLists.txt ocl: add support for initialization from user-provided OpenCL handles 2013-12-12 19:59:22 +04:00