Merge pull request #6828 from paroj:cmatvals_cpp
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:31:48 +0000 (11:31 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:31:48 +0000 (11:31 +0000)
1  2 
modules/calib3d/src/calibration.cpp
modules/calib3d/test/test_cameracalibration.cpp

Simple merge