Fixed several merge issues
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Jul 2016 08:45:32 +0000 (11:45 +0300)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Jul 2016 08:48:28 +0000 (11:48 +0300)
commit2a350b11ddbbf56814eb2b4616e5fbb69598ee21
tree4f9ca8ab0edde038f244d2e9bb1a1b7ee6a0d81b
parent74b83cfce59318c90683fb5daa73fc8d4bea118e
Fixed several merge issues
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/calib3d/src/calibinit.cpp