Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
pics	Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.	2012-08-23 14:56:02 +04:00
calib3d.rst	cleaned RST formatting a bit	2011-02-26 11:05:10 +00:00
camera_calibration_and_3d_reconstruction.rst	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00