Merge remote-tracking branch 'upstream/master' into rho
authorOlexa Bilaniuk <obilaniu@gmail.com>
Tue, 30 Dec 2014 01:55:24 +0000 (20:55 -0500)
committerOlexa Bilaniuk <obilaniu@gmail.com>
Tue, 30 Dec 2014 01:55:24 +0000 (20:55 -0500)
1  2 
modules/calib3d/include/opencv2/calib3d.hpp