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
..
perf_cuda_softcascade.cpp	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
perf_main.cpp	replaced gpu->cuda in files names	2013-09-02 14:00:44 +04:00
perf_precomp.hpp	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
perf_softcascade.cpp	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00