generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
045a856c24
opencv/modules/ocl/include/opencv2/ocl
History
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
private Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
matrix_operations.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-02 19:44:51 +04:00
ocl.hpp gpu -> ocl 2013-08-29 18:32:06 +04:00