mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-22 23:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3d3b310ae1
opencv/samples
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
..
android Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
c DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
directx core: added DirectX interop implementation (OpenCL) with samples 2013-12-13 19:02:41 +04:00
gpu DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02: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 2013-12-23 18:50:17 +04:00
python2 mouse_and_match.py missing import cv2 2013-11-24 15:58:13 +01:00
winrt Filter selection and several filters implemented for WinRT sample. 2013-11-29 09:47:25 +04:00
CMakeLists.txt core: added DirectX interop implementation (OpenCL) with samples 2013-12-13 19:02:41 +04:00