Merge pull request #2478 from clemenscorny:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Mar 2014 08:19:53 +0000 (12:19 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Mar 2014 08:19:54 +0000 (12:19 +0400)
commit491b84d463f2a25d96c8a2cc85eb6ad6f23e25e6
tree328ca442af53b0140d063a913862a636ad7f1357
parentd67b450741a4014f6d7acee79dcebbda68178fe2
parentf1c8b4b9651540825b14a5849eb79d9bd0a379d0
Merge pull request #2478 from clemenscorny:master
modules/features2d/include/opencv2/features2d.hpp