Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

2013-08-27 13:26:44 +04:00

..

autocalib.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

blenders.rst

Documentation: improved correctness checking for superclasses

2012-05-29 14:51:59 +00:00

camera.rst

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

exposure_compensation.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

high_level.rst

Normalized file endings.

2013-08-21 18:59:25 +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

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

stitching.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

StitchingPipeline.jpg

Updated the stitching pipeline image

2012-01-28 15:49:35 +00:00

warpers.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00