Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/calib3d/src/calibration.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp samples/ocl/adaptive_bilateral_filter.cpp samples/ocl/bgfg_segm.cpp samples/ocl/clahe.cpp samples/ocl/facedetect.cpp samples/ocl/pyrlk_optical_flow.cpp samples/ocl/squares.cpp samples/ocl/surf_matcher.cpp samples/ocl/tvl1_optical_flow.cpp		2013-10-28 13:38:25 +04:00
..
cuda	renamed gpuarithm -> cudaarithm	2013-09-02 14:00:42 +04:00
opencl	fixing typo	2013-10-25 18:00:46 +04:00
nonfree_init.cpp	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
precomp.hpp	replaced gpu->cuda in files names	2013-09-02 14:00:44 +04:00
sift.cpp	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
surf.cpp	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
surf.cuda.cpp	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
surf.ocl.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-28 13:38:25 +04:00