Merge pull request #7818 from catree:solvePnP_doc
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Dec 2016 19:01:15 +0000 (19:01 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Dec 2016 19:01:15 +0000 (19:01 +0000)

Trivial merge