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	renamed gpu* source to cuda* in core module	2013-09-02 14:00:42 +04:00
cuda_invoker.hpp	renamed gpu* source to cuda* in core module	2013-09-02 14:00:42 +04:00
detector_cuda.cpp	renamed gpu namespace -> cuda	2013-09-02 14:00:41 +04:00
detector.cpp	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
integral_channel_builder.cpp	Move border type constants and Moments class to core module	2013-04-10 19:14:24 +04:00
octave.cpp	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
precomp.hpp	renamed gpu* source to cuda* in core module	2013-09-02 14:00:42 +04:00
softcascade_init.cpp	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00