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)
commit46631c4b18041f096bc45fa2bbd5f3a8ad341184
tree768b03a850ae47db46099cb0fd5818910080cbf4
parentbcc630a8dc52cb0a87ce2f1218464a1458b58d14
parent61991a333049667c96775fa3fc196f30443d664f
Merge remote-tracking branch 'upstream/master' into rho
modules/calib3d/include/opencv2/calib3d.hpp