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)
commit8907e6feac913c87eddbe8533ff8be09fead2fa2
treebddcddeeb5c0c9514d612e5b0b4611db81e7c14a
parent045f8294bbcfbbaabe6055de4d8afa5a8bc55639
parent4c52dfc9569a3b547de2b9eee47c535ed035860f
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
modules/calib3d/include/opencv2/calib3d.hpp