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
..
test_channel_features.cpp
test_cuda_softcascade.cpp
test_main.cpp
test_precomp.hpp
test_softcascade.cpp
test_training.cpp
utility.cpp
utility.hpp