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	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
basic_structures.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
clustering.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
command_line_parser.rst	Update documentation	2013-03-22 22:14:54 +04:00
core.rst	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
drawing_functions.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
dynamic_structures.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
intro.rst	Updated documentation to new "COLOR_" format for color conversion enums.	2013-06-05 21:59:01 -04:00
old_basic_structures.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
old_xml_yaml_persistence.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
opengl_interop.rst	Fixed documentation errors.	2013-08-06 18:07:08 +04:00
operations_on_arrays.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
utility_and_system_functions_and_macros.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
xml_yaml_persistence.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00