Vladislav Vinogradov 1ad4592bfc Merge branch 'master' into gpu-cuda-rename ... Conflicts: modules/cudaoptflow/perf/perf_optflow.cpp modules/cudaoptflow/src/tvl1flow.cpp samples/gpu/stereo_multi.cpp		2013-09-04 09:58:32 +04:00
..
bm_fast.cu
bm.cu
farneback.cu
needle_map.cu
pyrlk.cu
tvl1flow.cu	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00