Merge pull request #6845 from jbosch:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Sep 2016 11:57:06 +0000 (11:57 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Sep 2016 11:57:06 +0000 (11:57 +0000)
1  2 
modules/calib3d/src/fisheye.cpp

Simple merge