Merge pull request #7082 from souch55:Fixmerge
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 16 Aug 2016 09:30:39 +0000 (09:30 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 16 Aug 2016 09:30:39 +0000 (09:30 +0000)
1  2 
modules/calib3d/src/calibration.cpp

Simple merge