Merge pull request #2352 from ilya-lavrenov:flann
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 18 Feb 2014 09:24:40 +0000 (13:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Feb 2014 09:24:41 +0000 (13:24 +0400)
commitff9a0815b9ad88f09bc55e8b8320745aa94869da
treea6909f65e3e17c23643a804d3e33a4a712e70df0
parent2409812803416e32e3c11728ab833c3885ff459d
parent6ad7b64912755cce33ce4bd8b21a47da8a0547cc
Merge pull request #2352 from ilya-lavrenov:flann
modules/features2d/include/opencv2/features2d.hpp