Merge branch 'master' of https://github.com/Itseez/opencv
authoredgarriba <edgar.riba@gmail.com>
Tue, 12 Aug 2014 14:45:22 +0000 (16:45 +0200)
committeredgarriba <edgar.riba@gmail.com>
Tue, 12 Aug 2014 14:45:22 +0000 (16:45 +0200)
commit1dec1645e56698d90c6e62414ad09bc4357559f6
tree63eeadbf6e0f2a07c2a16ad893a31734f77a3581
parentde2861e7a90333f39a74fc2c0e359e8972c6edac
parentc97c0be4f21f8f807c05fa9cdc4c7f72d987d594
Merge branch 'master' of https://github.com/Itseez/opencv
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/include/opencv2/calib3d.hpp
samples/cpp/CMakeLists.txt