Merge pull request #9848 from jet47:features2d-optional-flann-dep
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Oct 2017 10:45:16 +0000 (10:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Oct 2017 10:45:16 +0000 (10:45 +0000)
commit29144436851cecb7f18cd1ea8609ba7f80ac6219
treeaf7c870267b86b188197bb850f928e5d8707db60
parentfef1f9b0a70c8eb12233c32af750f858e600c2cb
parent26fe8bd4f24b04c7678fd1cc5afa62ff7dfb3255
Merge pull request #9848 from jet47:features2d-optional-flann-dep