opencv/modules/objdetect/doc
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
pics propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:06:42 +00:00
cascade_classification.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
latent_svm.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
objdetect.rst move soft cascade functionality into dedicated module 2013-02-01 14:36:05 +04:00