Merge pull request #4025 from vpisarev:features2d_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 19:16:27 +0000 (19:16 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 19:16:27 +0000 (19:16 +0000)
commitef8182e12a1ffcac81e766e4907fc71208fa0a31
treec717ae18838ada8864e20a9cb946b10ca860b066
parent021473e93e3e1633062cb36215e16182f97dddf7
parentaf47b6551f2f06ccce8243a9888a6481b9c58dc4
Merge pull request #4025 from vpisarev:features2d_fixes