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
..
autocalib.rst	More fixes for documentation.	2012-05-28 20:11:38 +00:00
blenders.rst	Documentation: improved correctness checking for superclasses	2012-05-29 14:51:59 +00:00
camera.rst	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
exposure_compensation.rst	Documentation: improved correctness checking for superclasses	2012-05-29 14:51:59 +00:00
high_level.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
introduction.rst	#1205 fixed more bugs/typos in parameters	2012-03-29 08:07:57 +00:00
matching.rst	Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.	2012-08-23 14:56:02 +04:00
motion_estimation.rst	fixed docs	2013-07-05 10:16:22 +04:00
seam_estimation.rst	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
stitching.rst	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
StitchingPipeline.jpg	Updated the stitching pipeline image	2012-01-28 15:49:35 +00:00
warpers.rst	Documentation: improved correctness checking for superclasses	2012-05-29 14:51:59 +00:00