Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into...
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 11:13:35 +0000 (15:13 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 11:13:35 +0000 (15:13 +0400)
commitcc11a8d183302e0abf43940fa1f030ad9807d4a8
treecd3288a76af140f3055ce2321f50441e9f535554
parent54e65598bd977671aada8b99c9aac60df1494dd8
parentf6f839eb3c37a6d676910d98ecf196d16d609e58
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4

Conflicts:
modules/features2d/src/orb.cpp