Merge pull request #3299 from felixendres:orb_keypoint_detector_threshold
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 9 Oct 2014 14:52:38 +0000 (14:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 9 Oct 2014 14:52:38 +0000 (14:52 +0000)
1  2 
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/features2d_init.cpp
modules/features2d/src/orb.cpp

Simple merge