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
..
pics	moved planar subdiv docs to legacy; added Input/OutputArray docs to core	2012-04-28 12:59:21 +00:00
common_interfaces_of_descriptor_extractors.rst	Update documentation	2013-03-22 22:14:54 +04:00
common_interfaces_of_generic_descriptor_matchers.rst	Update documentation	2013-03-22 22:14:54 +04:00
expectation_maximization.rst	Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong	2013-08-07 14:49:33 +02:00
feature_detection_and_description.rst	Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong	2013-08-07 14:49:33 +02:00
histograms.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
legacy.rst	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
motion_analysis.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
planar_subdivisions.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00