Vladislav Vinogradov 1036ce807c Merge branch 'master' into gpu-cuda-rename ...

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudaimgproc/src/gftt.cpp
	modules/objdetect/include/opencv2/objdetect/erfilter.hpp
	modules/objdetect/src/erfilter.cpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

2013-09-09 12:57:35 +04:00

..

android

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

c

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-02 19:44:51 +04:00

cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-09 12:57:35 +04:00

gpu

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +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