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
..
android	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
c	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
cpp	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
gpu	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
java	Normalized file endings.	2013-08-21 18:59:25 +04:00
MacOSX/FaceTracker	Converted tabs to spaces.	2013-08-21 18:59:26 +04:00
ocl	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
python2	War on Whitespace, master edition: tabs.	2013-08-27 17:13:53 +04:00
winrt/ImageManipulations	Removed incorrect iCCP chunks from GUI resources.	2013-08-30 09:49:24 -04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00