mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6d77cbee7e
opencv/modules/ocl
History
Roman Donchenko 9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-16 15:02:12 +04:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-16 15:02:12 +04:00
perf Merge pull request #1954 from pentschev:ocl_features2d_fast_master 2013-12-12 17:37:09 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-16 15:02:12 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-16 15:02:12 +04:00
CMakeLists.txt ocl: add support for initialization from user-provided OpenCL handles 2013-12-12 19:59:22 +04:00