Merge pull request #3116 from shubhra:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
commit887a95024313ccfa4477df7b373f60735cc3a035
tree00c6828116975a79b5619bc54d7420c9bc0e97da
parent0eb1c7edb1e49aa2133ba6ca3af18be72f4a6760
parent7b2a1d15ccf1cdee14a73281326df28791c65313
Merge pull request #3116 from shubhra:master
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/include/opencv2/calib3d/calib3d_c.h