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

Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp

2014-01-14 11:53: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-01-14 11:53:59 +04:00

cpp

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

2014-01-14 11:53:59 +04:00

directx

core: added DirectX interop implementation (OpenCL) with samples

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

gpu

added the first T-API example - CamShift tracking

2013-12-29 14:36: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

ocl

converted CPU-based example to T-API (Mat 2 UMat, etc)

2013-12-30 03:19:17 +04:00

python2

mouse_and_match.py missing import cv2

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

tapi

converted CPU-based example to T-API (Mat 2 UMat, etc)

2013-12-30 03:19:17 +04:00

winrt

Filter selection and several filters implemented for WinRT sample.

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

CMakeLists.txt

added the first T-API example - CamShift tracking

2013-12-29 14:36:59 +04:00