Merge remote-tracking branch 'upstream/master'
authoredgarriba <edgar.riba@gmail.com>
Tue, 5 Aug 2014 10:59:47 +0000 (12:59 +0200)
committeredgarriba <edgar.riba@gmail.com>
Tue, 5 Aug 2014 10:59:47 +0000 (12:59 +0200)
commita3e74ec5211d80b9bec76d29a21be31173969aec
tree76f1beca4b8103a62571143078f762dd2242bd02
parent3e2a57ff3561dea07a772250b2dc54dcd8352a09
parenta05ce00a654268f214fcf43e815891a01f7987b5
Merge remote-tracking branch 'upstream/master'

Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
doc/conf.py
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/include/opencv2/calib3d.hpp