Merge pull request #3116 from shubhra:master

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)

committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
diff --cc modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
Simple merge
diff --cc modules/calib3d/include/opencv2/calib3d.hpp
Simple merge
diff --cc modules/calib3d/include/opencv2/calib3d/calib3d_c.h
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
committer	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Fri, 22 Aug 2014 07:15:40 +0000 (07:15 +0000)
		1	2
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst	patch \|	diff1 \|	diff2 \|	blob \| history
modules/calib3d/include/opencv2/calib3d.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/calib3d/include/opencv2/calib3d/calib3d_c.h	patch \|	diff1 \|	diff2 \|	blob \| history