Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
authorOlexa Bilaniuk <obilaniu@gmail.com>
Wed, 4 Feb 2015 03:50:45 +0000 (22:50 -0500)
committerOlexa Bilaniuk <obilaniu@gmail.com>
Wed, 4 Feb 2015 03:50:45 +0000 (22:50 -0500)
1  2 
modules/calib3d/include/opencv2/calib3d.hpp