Merge pull request #5351 from paroj:calibout
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 11 Dec 2015 16:21:06 +0000 (16:21 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 11 Dec 2015 16:21:06 +0000 (16:21 +0000)
1  2 
modules/calib3d/src/calibration.cpp

Simple merge