opencv/modules/contrib/doc/facerec
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
..
etc Added the cv::FaceRecognizer documentation (API, Face Recognition Guide, Tutorials). 2012-06-26 20:13:11 +00:00
img Added the cv::FaceRecognizer documentation (API, Face Recognition Guide, Tutorials). 2012-06-26 20:13:11 +00:00
src Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
tutorial Normalized file endings. 2013-08-21 18:59:25 +04:00
colormaps.rst Update documentation 2013-03-22 22:14:54 +04:00
facerec_api.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
facerec_changelog.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
facerec_tutorial.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
index.rst Normalized file endings. 2013-08-21 18:59:25 +04:00