mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-23 10:03:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
bbc35d609d
opencv/modules/ocl
History
Roman Donchenko bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
..
doc merge with upstream 2014-01-05 19:00:25 +01:00
include/opencv2 Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl 2014-01-18 10:38:07 +01:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
src Merge pull request #2027 from AD-530:brief_cl 2014-01-27 09:49:46 +04:00
test Merge pull request #2027 from AD-530:brief_cl 2014-01-27 09:49:46 +04:00
CMakeLists.txt ocl: add support for initialization from user-provided OpenCL handles 2013-12-12 19:59:22 +04:00