edgarriba a3e74ec521 Merge remote-tracking branch 'upstream/master' ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst		2014-08-05 12:59:47 +02:00
..
pics	Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.	2012-08-23 14:56:02 +04:00
calib3d.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
camera_calibration_and_3d_reconstruction.rst	Merge remote-tracking branch 'upstream/master'	2014-08-05 12:59:47 +02:00