Merge pull request #511 from aritzlc:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 27 Feb 2013 15:33:01 +0000 (19:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Feb 2013 15:33:01 +0000 (19:33 +0400)
commit7b79eaf5beff0b497c6be2c08c9472c0b3946905
treeda618f144fedc59e0b996e69cafad642c46c3353
parent242a6de7198713663f952817522131d449615b72
parent0448f240a05bde9402541317053e4b2f8091c0bd
Merge pull request #511 from aritzlc:master
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/calibration.cpp
modules/imgproc/src/undistort.cpp
modules/java/generator/gen_java.py