Merge remote-tracking branch 'upstream/master'
authoredgarriba <edgar.riba@gmail.com>
Mon, 6 Oct 2014 21:46:30 +0000 (23:46 +0200)
committeredgarriba <edgar.riba@gmail.com>
Mon, 6 Oct 2014 21:46:30 +0000 (23:46 +0200)
1  2 
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst