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
..
cuda	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
bm_fast.cpp
bm.cpp
brox.cpp
farneback.cpp
interpolate_frames.cpp
needle_map.cpp
precomp.hpp
pyrlk.cpp
tvl1flow.cpp	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00