generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10cb9a0c4a
opencv/modules/contrib/doc/facerec
History
Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +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 branch '2.4' 2013-04-12 15:35:38 +04:00
tutorial Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +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 Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
facerec_tutorial.rst Merge branch '2.4' 2013-04-05 21:11:59 +04:00
index.rst Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00