Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Feb 2014 11:00:42 +0000 (15:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 17 Feb 2014 11:00:47 +0000 (15:00 +0400)
commita6d64e254fdc5b063d5124bd93c4b10a5c41affd
tree3f416916b10030baad2819389b697b67e95b00f5
parenta0bb74a086d33a57509d147fccfdb3abd28b37dc
parentf85aa929f1b0227c6ed2bc983fee8ebf34f48433
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
modules/flann/include/opencv2/flann/dist.h