Merge pull request #1881 from pentschev:defaultNorm_master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 17 Dec 2013 09:53:59 +0000 (13:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 09:53:59 +0000 (13:53 +0400)
commite49b8dee404bcb7f78ed962fadbd85530a86960d
treebbe10e29ff22762fc9e75426e4f7131f0a0327b4
parent52a785e95a30d9336bfbac97a0a0d0089ffaa7de
parent6f3163f62d4234a862a18af274503cefa9e352a3
Merge pull request #1881 from pentschev:defaultNorm_master
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/orb.cpp