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
..
doc	fix documentation	2013-09-02 14:00:44 +04:00
include/opencv2	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
misc	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
perf	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
src	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
test	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
CMakeLists.txt	fixed compilation warnings	2013-04-08 17:25:16 +04:00