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
..
2014-03-17 10:42:19 +04:00
2014-02-25 17:33:12 +04:00
2013-08-21 18:59:25 +04:00
2014-07-28 12:03:02 +02:00