Merge pull request #696 from znah:detect_method
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Jun 2013 08:01:56 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Jun 2013 08:01:59 +0000 (12:01 +0400)
commit6faf00b8e52a45434158927afa23b35c80b6a5f4
tree5cca6d4b0dba5e7d462bf93c48028311e23a767c
parent1acbc7b7bd33dbc474c17c7ba4c5fd2c82031ec4
parent4d510be2c95a95fa325c2452ea03f7346d66b4b8
Merge pull request #696 from znah:detect_method
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/descriptors.cpp