Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt

2014-02-03 13:23:59 +04:00

..

android

CUDA support check added.

2013-12-26 14:52:41 +04:00

c

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

2014-02-03 13:23:59 +04:00

cpp

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

2014-02-03 13:23:59 +04:00

directx

core: added DirectX interop implementation (OpenCL) with samples

2013-12-13 19:02:41 +04:00

gpu

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

2014-02-03 13:23:59 +04:00

java

add clojure sample

2013-12-11 13:26:47 +01:00

MacOSX/FaceTracker

Converted tabs to spaces.

2013-08-21 18:59:26 +04:00

python2

mouse_and_match.py missing import cv2

2013-11-24 15:58:13 +01:00

tapi

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

2014-02-03 13:23:59 +04:00

winrt

Filter selection and several filters implemented for WinRT sample.

2013-11-29 09:47:25 +04:00

CMakeLists.txt

OCL module 2 trash

2014-01-31 13:19:16 +04:00