opencv/samples
Roman Donchenko bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
2014-01-27 15:28:14 +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-27 15:28:14 +04:00
cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +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-01-27 15:28:14 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
python2 mouse_and_match.py missing import cv2 2013-11-24 15:58:13 +01:00
tapi fixes 2014-01-24 13:37:19 +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