opencv/modules/contrib/doc/facerec
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +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-09-10 11:30:19 +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