mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
82330a51bd
opencv/doc/user_guide
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
..
ug_features2d.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
ug_highgui.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
ug_intelperc.rst Fix build errors 2013-12-17 18:39:52 +04:00
ug_mat.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
ug_traincascade.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
user_guide.rst Add set/get depth generator properties by default. Add documentation 2013-12-17 12:00:40 +04:00