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
..
data_structures.rst	remove a warning on Linux	2013-02-05 17:16:40 +08: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
image_filtering.rst	Add some documentation on ocl::convolve	2013-04-08 17:15:52 +08:00
image_processing.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
introduction.rst	Merge branch '2.4'	2013-02-28 11:17:06 +04:00
matrix_reductions.rst	Fix discrepancies between function signatures in headers and documentation	2012-12-26 18:24:50 +04:00
object_detection.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
ocl.rst	fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)	2012-10-31 15:15:51 +04:00
operations_on_matrices.rst	Fix doc build error.	2013-07-30 14:12:22 +08:00
structures_and_utility_functions.rst	Fix discrepancies between function signatures in headers and documentation	2012-12-26 18:24:50 +04:00