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)
commitf317d1277fbb8f515f16dcd4da8d526d6b639bda
tree469bb58b3a0611befe2f4a303867b88a60a2492a
parent2494e028c00f0591aef8c62eaa2efc73f721c625
parent478dd01c9164564aaacd1c4ea19f76b48c6b1201
Merge remote-tracking branch 'upstream/master'
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst